diff options
Diffstat (limited to 'include/asm-xtensa')
-rw-r--r-- | include/asm-xtensa/atomic.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/checksum.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/delay.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/dma.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/hardirq.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/ide.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/io.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/irq.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/mmu_context.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/page.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/pgalloc.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/platform.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/system.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/unistd.h | 21 |
14 files changed, 3 insertions, 31 deletions
diff --git a/include/asm-xtensa/atomic.h b/include/asm-xtensa/atomic.h index fe105a123924..5c2672021068 100644 --- a/include/asm-xtensa/atomic.h +++ b/include/asm-xtensa/atomic.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #ifndef _XTENSA_ATOMIC_H | 13 | #ifndef _XTENSA_ATOMIC_H |
14 | #define _XTENSA_ATOMIC_H | 14 | #define _XTENSA_ATOMIC_H |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/stringify.h> | 16 | #include <linux/stringify.h> |
18 | 17 | ||
19 | typedef struct { volatile int counter; } atomic_t; | 18 | typedef struct { volatile int counter; } atomic_t; |
diff --git a/include/asm-xtensa/checksum.h b/include/asm-xtensa/checksum.h index 81a797ae3abe..bdc00ae9be48 100644 --- a/include/asm-xtensa/checksum.h +++ b/include/asm-xtensa/checksum.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _XTENSA_CHECKSUM_H | 11 | #ifndef _XTENSA_CHECKSUM_H |
12 | #define _XTENSA_CHECKSUM_H | 12 | #define _XTENSA_CHECKSUM_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/in6.h> | 14 | #include <linux/in6.h> |
16 | #include <xtensa/config/core.h> | 15 | #include <xtensa/config/core.h> |
17 | 16 | ||
diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h index 1bc601ec3621..e1d8c9e010c1 100644 --- a/include/asm-xtensa/delay.h +++ b/include/asm-xtensa/delay.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #ifndef _XTENSA_DELAY_H | 12 | #ifndef _XTENSA_DELAY_H |
13 | #define _XTENSA_DELAY_H | 13 | #define _XTENSA_DELAY_H |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | #include <asm/processor.h> | 15 | #include <asm/processor.h> |
17 | #include <asm/param.h> | 16 | #include <asm/param.h> |
18 | 17 | ||
diff --git a/include/asm-xtensa/dma.h b/include/asm-xtensa/dma.h index 1c22b0234586..db2633f67789 100644 --- a/include/asm-xtensa/dma.h +++ b/include/asm-xtensa/dma.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _XTENSA_DMA_H | 11 | #ifndef _XTENSA_DMA_H |
12 | #define _XTENSA_DMA_H | 12 | #define _XTENSA_DMA_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <asm/io.h> /* need byte IO */ | 14 | #include <asm/io.h> /* need byte IO */ |
16 | #include <xtensa/config/core.h> | 15 | #include <xtensa/config/core.h> |
17 | 16 | ||
diff --git a/include/asm-xtensa/hardirq.h b/include/asm-xtensa/hardirq.h index aa9c1adf68d7..87cb19d1b10c 100644 --- a/include/asm-xtensa/hardirq.h +++ b/include/asm-xtensa/hardirq.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _XTENSA_HARDIRQ_H | 11 | #ifndef _XTENSA_HARDIRQ_H |
12 | #define _XTENSA_HARDIRQ_H | 12 | #define _XTENSA_HARDIRQ_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/cache.h> | 14 | #include <linux/cache.h> |
16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
17 | 16 | ||
diff --git a/include/asm-xtensa/ide.h b/include/asm-xtensa/ide.h index b523cd4a486e..6b912742a42d 100644 --- a/include/asm-xtensa/ide.h +++ b/include/asm-xtensa/ide.h | |||
@@ -14,7 +14,6 @@ | |||
14 | 14 | ||
15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | 17 | ||
19 | #ifndef MAX_HWIFS | 18 | #ifndef MAX_HWIFS |
20 | # define MAX_HWIFS 1 | 19 | # define MAX_HWIFS 1 |
diff --git a/include/asm-xtensa/io.h b/include/asm-xtensa/io.h index c5c13985bbe1..556e5eed34f5 100644 --- a/include/asm-xtensa/io.h +++ b/include/asm-xtensa/io.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define _XTENSA_IO_H | 12 | #define _XTENSA_IO_H |
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | #include <linux/config.h> | ||
16 | #include <asm/byteorder.h> | 15 | #include <asm/byteorder.h> |
17 | 16 | ||
18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
diff --git a/include/asm-xtensa/irq.h b/include/asm-xtensa/irq.h index d984e955938f..049fde7e752d 100644 --- a/include/asm-xtensa/irq.h +++ b/include/asm-xtensa/irq.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _XTENSA_IRQ_H | 11 | #ifndef _XTENSA_IRQ_H |
12 | #define _XTENSA_IRQ_H | 12 | #define _XTENSA_IRQ_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <asm/platform/hardware.h> | 14 | #include <asm/platform/hardware.h> |
16 | 15 | ||
17 | #include <xtensa/config/core.h> | 16 | #include <xtensa/config/core.h> |
diff --git a/include/asm-xtensa/mmu_context.h b/include/asm-xtensa/mmu_context.h index 364a7b057bfa..af683a74a4ec 100644 --- a/include/asm-xtensa/mmu_context.h +++ b/include/asm-xtensa/mmu_context.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #ifndef _XTENSA_MMU_CONTEXT_H | 13 | #ifndef _XTENSA_MMU_CONTEXT_H |
14 | #define _XTENSA_MMU_CONTEXT_H | 14 | #define _XTENSA_MMU_CONTEXT_H |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/stringify.h> | 16 | #include <linux/stringify.h> |
18 | 17 | ||
19 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index 992bac5c1258..40f4c6c3f580 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | 15 | ||
16 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
17 | #include <linux/config.h> | ||
18 | 17 | ||
19 | /* | 18 | /* |
20 | * PAGE_SHIFT determines the page size | 19 | * PAGE_SHIFT determines the page size |
diff --git a/include/asm-xtensa/pgalloc.h b/include/asm-xtensa/pgalloc.h index 734a8d060395..d56ddf2055e1 100644 --- a/include/asm-xtensa/pgalloc.h +++ b/include/asm-xtensa/pgalloc.h | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
18 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
19 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
diff --git a/include/asm-xtensa/platform.h b/include/asm-xtensa/platform.h index 36163894bc20..48135a9718b0 100644 --- a/include/asm-xtensa/platform.h +++ b/include/asm-xtensa/platform.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #ifndef _XTENSA_PLATFORM_H | 13 | #ifndef _XTENSA_PLATFORM_H |
14 | #define _XTENSA_PLATFORM_H | 14 | #define _XTENSA_PLATFORM_H |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
18 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
19 | 18 | ||
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h index b29f7ae6a08a..f986170bd2a1 100644 --- a/include/asm-xtensa/system.h +++ b/include/asm-xtensa/system.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _XTENSA_SYSTEM_H | 11 | #ifndef _XTENSA_SYSTEM_H |
12 | #define _XTENSA_SYSTEM_H | 12 | #define _XTENSA_SYSTEM_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/stringify.h> | 14 | #include <linux/stringify.h> |
16 | 15 | ||
17 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h index 6b39d6609d9c..5e1b99dc4ab3 100644 --- a/include/asm-xtensa/unistd.h +++ b/include/asm-xtensa/unistd.h | |||
@@ -11,8 +11,6 @@ | |||
11 | #ifndef _XTENSA_UNISTD_H | 11 | #ifndef _XTENSA_UNISTD_H |
12 | #define _XTENSA_UNISTD_H | 12 | #define _XTENSA_UNISTD_H |
13 | 13 | ||
14 | #include <linux/linkage.h> | ||
15 | |||
16 | #define __NR_spill 0 | 14 | #define __NR_spill 0 |
17 | #define __NR_exit 1 | 15 | #define __NR_exit 1 |
18 | #define __NR_read 3 | 16 | #define __NR_read 3 |
@@ -221,21 +219,9 @@ | |||
221 | #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ | 219 | #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/ |
222 | 220 | ||
223 | #ifdef __KERNEL__ | 221 | #ifdef __KERNEL__ |
224 | #define __syscall_return(type, res) return ((type)(res)) | 222 | #include <linux/linkage.h> |
225 | #else | ||
226 | #define __syscall_return(type, res) \ | ||
227 | do { \ | ||
228 | if ((unsigned long)(res) >= (unsigned long)(-125)) { \ | ||
229 | /* Avoid using "res" which is declared to be in register r2; \ | ||
230 | * errno might expand to a function call and clobber it. */ \ | ||
231 | int __err = -(res); \ | ||
232 | errno = __err; \ | ||
233 | res = -1; \ | ||
234 | } \ | ||
235 | return (type) (res); \ | ||
236 | } while (0) | ||
237 | #endif | ||
238 | 223 | ||
224 | #define __syscall_return(type, res) return ((type)(res)) | ||
239 | 225 | ||
240 | /* Tensilica's xt-xcc compiler is much more agressive at code | 226 | /* Tensilica's xt-xcc compiler is much more agressive at code |
241 | * optimization than gcc. Multiple __asm__ statements are | 227 | * optimization than gcc. Multiple __asm__ statements are |
@@ -429,11 +415,10 @@ static __inline__ _syscall3(int,execve,const char*,file,char**,argv,char**,envp) | |||
429 | */ | 415 | */ |
430 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); | 416 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); |
431 | 417 | ||
432 | #ifdef __KERNEL__ | ||
433 | #define __ARCH_WANT_STAT64 | 418 | #define __ARCH_WANT_STAT64 |
434 | #define __ARCH_WANT_SYS_UTIME | 419 | #define __ARCH_WANT_SYS_UTIME |
435 | #define __ARCH_WANT_SYS_LLSEEK | 420 | #define __ARCH_WANT_SYS_LLSEEK |
436 | #define __ARCH_WANT_SYS_RT_SIGACTION | 421 | #define __ARCH_WANT_SYS_RT_SIGACTION |
437 | #endif | 422 | #endif /* __KERNEL__ */ |
438 | 423 | ||
439 | #endif /* _XTENSA_UNISTD_H */ | 424 | #endif /* _XTENSA_UNISTD_H */ |