Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker driver, nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -67,9 +67,6 @@ struct thread_struct {
|
||||
.current_ds = KERNEL_DS, \
|
||||
}
|
||||
|
||||
/* Return saved PC of a blocked thread. */
|
||||
unsigned long thread_saved_pc(struct task_struct *t);
|
||||
|
||||
/* Do necessary setup to start up a newly executed thread. */
|
||||
static inline void start_thread(struct pt_regs * regs, unsigned long pc,
|
||||
unsigned long sp)
|
||||
|
@@ -89,9 +89,7 @@ struct thread_struct {
|
||||
#include <linux/types.h>
|
||||
#include <asm/fpumacro.h>
|
||||
|
||||
/* Return saved PC of a blocked thread. */
|
||||
struct task_struct;
|
||||
unsigned long thread_saved_pc(struct task_struct *);
|
||||
|
||||
/* On Uniprocessor, even in RMO processes see TSO semantics */
|
||||
#ifdef CONFIG_SMP
|
||||
|
Reference in New Issue
Block a user