diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-15 01:43:22 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-15 01:43:22 -0800 |
| commit | fba40107b968ffef3ac9091618a20f0fc0a59b8f (patch) | |
| tree | ede9c23cccbadf91bb475f339a2f8bf260aa8b2e /include | |
| parent | 0986231473bff595a6fcc2e82caae4342548091f (diff) | |
| parent | 9e12ea16f18b3c20aa14b78688798dca0197a7ba (diff) | |
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/processor.h | 6 | ||||
| -rw-r--r-- | include/linux/list.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 18d3995bc586..da0dff483ba7 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -469,8 +469,8 @@ #define ICMP SPRN_ICMP /* Instruction TLB Compare Register */ #define IMISS SPRN_IMISS /* Instruction TLB Miss Register */ #define IMMR SPRN_IMMR /* PPC 860/821 Internal Memory Map Register */ -#define L2CR SPRN_L2CR /* PPC 750 L2 control register */ -#define L3CR SPRN_L3CR /* PPC 7450 L3 Cache control register */ +#define L2CR SPRN_L2CR /* Classic PPC L2 cache control register */ +#define L3CR SPRN_L3CR /* PPC 745x L3 cache control register */ #define LR SPRN_LR #define PVR SPRN_PVR /* Processor Version */ #define RPA SPRN_RPA /* Required Physical Address Register */ @@ -609,7 +609,7 @@ void start_thread(struct pt_regs *regs, unsigned long nip, unsigned long sp); void release_thread(struct task_struct *); /* Prepare to copy thread state - unlazy all lazy status */ -#define prepare_to_copy(tsk) do { } while (0) +extern void prepare_to_copy(struct task_struct *tsk); /* * Create a new kernel thread. diff --git a/include/linux/list.h b/include/linux/list.h index 3cd4d3bd1ebb..f082a59aa3c8 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -5,7 +5,6 @@ #include <linux/stddef.h> #include <linux/prefetch.h> -#include <linux/stddef.h> #include <asm/system.h> /* |