[PATCH/RFC] remove duplicate #includes, take II, part C

From: Herbert Poetzl
Date: Sat Feb 18 2006 - 09:57:28 EST



the wrong ones

---

diff -NurpP linux-2.6.16-rc4/mm/slab.c linux-2.6.16-rc4-rmd/mm/slab.c
--- linux-2.6.16-rc4/mm/slab.c 2006-02-18 14:40:38 +0100
+++ linux-2.6.16-rc4-rmd/mm/slab.c 2006-02-18 15:30:15 +0100
@@ -626,7 +626,6 @@ struct cache_names {

static struct cache_names __initdata cache_names[] = {
#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
-#include <linux/kmalloc_sizes.h>
{NULL,}
#undef CACHE
};
diff -NurpP linux-2.6.16-rc4/arch/um/sys-x86_64/syscall_table.c linux-2.6.16-rc4-rmd/arch/um/sys-x86_64/syscall_table.c
--- linux-2.6.16-rc4/arch/um/sys-x86_64/syscall_table.c 2005-06-22 02:38:01 +0200
+++ linux-2.6.16-rc4-rmd/arch/um/sys-x86_64/syscall_table.c 2006-02-18 15:30:09 +0100
@@ -55,5 +55,4 @@ extern void sys_ni_syscall(void);
sys_call_ptr_t sys_call_table[__NR_syscall_max+1] __cacheline_aligned = {
/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
[0 ... __NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
};
diff -NurpP linux-2.6.16-rc4/arch/x86_64/kernel/syscall.c linux-2.6.16-rc4-rmd/arch/x86_64/kernel/syscall.c
--- linux-2.6.16-rc4/arch/x86_64/kernel/syscall.c 2006-02-18 14:39:50 +0100
+++ linux-2.6.16-rc4-rmd/arch/x86_64/kernel/syscall.c 2006-02-18 15:30:09 +0100
@@ -22,5 +22,4 @@ extern void sys_ni_syscall(void);
const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
[0 ... __NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
};

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/