diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /include/asm-mips | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/delay.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/hardirq.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/offset.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/pgalloc.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/processor.h | 2 |
5 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-mips/delay.h b/include/asm-mips/delay.h index 98fe1ec3d..a7fa5e56f 100644 --- a/include/asm-mips/delay.h +++ b/include/asm-mips/delay.h @@ -12,6 +12,8 @@ #include <linux/config.h> +#include <linux/config.h> + extern __inline__ void __delay(unsigned long loops) { diff --git a/include/asm-mips/hardirq.h b/include/asm-mips/hardirq.h index f881937a6..59d6681de 100644 --- a/include/asm-mips/hardirq.h +++ b/include/asm-mips/hardirq.h @@ -12,6 +12,7 @@ #include <linux/config.h> +#include <linux/config.h> #include <linux/threads.h> #include <linux/irq.h> diff --git a/include/asm-mips/offset.h b/include/asm-mips/offset.h index d807d8e82..42d7a5b81 100644 --- a/include/asm-mips/offset.h +++ b/include/asm-mips/offset.h @@ -52,7 +52,7 @@ #define TASK_COUNTER 32 #define TASK_PRIORITY 36 #define TASK_MM 44 -#define TASK_STRUCT_SIZE 904 +#define TASK_STRUCT_SIZE 880 /* MIPS specific thread_struct offsets. */ #define THREAD_REG16 584 diff --git a/include/asm-mips/pgalloc.h b/include/asm-mips/pgalloc.h index c9600661e..a91913bcc 100644 --- a/include/asm-mips/pgalloc.h +++ b/include/asm-mips/pgalloc.h @@ -12,6 +12,8 @@ #include <linux/config.h> +#include <linux/config.h> + /* TLB flushing: * * - flush_tlb_all() flushes all processes TLB entries diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index d6fb7526d..ab996d0b2 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h @@ -16,6 +16,8 @@ #include <asm/isadep.h> +#include <linux/config.h> + /* * Default implementation of macro that returns current * instruction pointer ("program counter"). |