From 366376151fcd5b99cd8ee78cca1276c132b27b0a Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:38:09 +0200 Subject: alpha: drop unused Kconfig symbol Signed-off-by: Paul Bolle Reviewed-by: Matt Turner Signed-off-by: Michal Marek --- arch/alpha/Kconfig | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/alpha') diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 60cde53d266c..c38c75092017 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -445,11 +445,6 @@ config ALPHA_EV67 Is this a machine based on the EV67 core? If in doubt, select N here and the machine will be treated as an EV6. -config ALPHA_EV7 - bool - depends on ALPHA_MARVEL - default y - config ALPHA_MCPCIA bool depends on ALPHA_RAWHIDE -- cgit v1.2.3 From ce7cf0731c328eec3694c97f4677e82a0d5d5064 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Mon, 1 Aug 2011 13:52:27 -0400 Subject: alpha: fix implicit stat.h usage in pci-sysfs.c To avoid this: arch/alpha/kernel/pci-sysfs.c:164: error: 'S_IRUSR' undeclared (first use in this function) arch/alpha/kernel/pci-sysfs.c:164: error: 'S_IWUSR' undeclared (first use in this function) make[2]: *** [arch/alpha/kernel/pci-sysfs.o] Error 1 Signed-off-by: Paul Gortmaker --- arch/alpha/kernel/pci-sysfs.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/alpha') diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c index b899e95f79fd..53649c7d0068 100644 --- a/arch/alpha/kernel/pci-sysfs.c +++ b/arch/alpha/kernel/pci-sysfs.c @@ -10,6 +10,7 @@ */ #include +#include #include #include -- cgit v1.2.3 From 00cd1176801d676607115fdda6e1f64b7e1ce02f Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Mon, 1 Aug 2011 13:50:15 -0400 Subject: alpha: Add export.h for THIS_MODULE/EXPORT_SYMBOL These files were getting it via the implicit module.h presence that was everywhere. Signed-off-by: Paul Gortmaker --- arch/alpha/kernel/core_irongate.c | 1 + arch/alpha/kernel/pci_iommu.c | 1 + arch/alpha/kernel/setup.c | 1 + 3 files changed, 3 insertions(+) (limited to 'arch/alpha') diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index a872078497be..00096df0f6ad 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -303,6 +303,7 @@ irongate_init_arch(void) #include #include #include +#include #include #define GET_PAGE_DIR_OFF(addr) (addr >> 22) diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 022c2748fa41..43610804987d 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index cc0fd862cf26..32de56067e63 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -43,6 +43,7 @@ #include #include #include +#include extern struct atomic_notifier_head panic_notifier_list; static int alpha_panic_event(struct notifier_block *, unsigned long, void *); -- cgit v1.2.3 From 0a8c384ebe4cc1c462076732dbffb595e7e81d5c Mon Sep 17 00:00:00 2001 From: Michael Cree Date: Mon, 31 Oct 2011 17:09:49 -0700 Subject: alpha: wire up accept4 syscall Somehow wiring up the accept4 syscall on Alpha was missed long ago. This commit rectifies that oversight. Signed-off-by: Michael Cree Reviewed-by: Matt Turner Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/alpha/include/asm/unistd.h | 3 ++- arch/alpha/kernel/systbls.S | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/alpha') diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 4ac48a095f3a..1fbfd6450a31 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -457,10 +457,11 @@ #define __NR_clock_adjtime 499 #define __NR_syncfs 500 #define __NR_setns 501 +#define __NR_accept4 502 #ifdef __KERNEL__ -#define NR_SYSCALLS 502 +#define NR_SYSCALLS 503 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 6acea1f96de3..53d0ce2d304c 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S @@ -520,6 +520,7 @@ sys_call_table: .quad sys_clock_adjtime .quad sys_syncfs /* 500 */ .quad sys_setns + .quad sys_accept4 .size sys_call_table, . - sys_call_table .type sys_call_table, @object -- cgit v1.2.3 From a8aff21ecc8c455687c5bb2b98cb04dce3eea7c7 Mon Sep 17 00:00:00 2001 From: Michael Cree Date: Mon, 31 Oct 2011 17:10:01 -0700 Subject: alpha: wire up sendmmsg syscall Signed-off-by: Michael Cree Reviewed-by: Matt Turner Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/alpha/include/asm/unistd.h | 3 ++- arch/alpha/kernel/systbls.S | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/alpha') diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 1fbfd6450a31..2207fc61665d 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -458,10 +458,11 @@ #define __NR_syncfs 500 #define __NR_setns 501 #define __NR_accept4 502 +#define __NR_sendmmsg 503 #ifdef __KERNEL__ -#define NR_SYSCALLS 503 +#define NR_SYSCALLS 504 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 53d0ce2d304c..e534e1c5bc11 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S @@ -521,6 +521,7 @@ sys_call_table: .quad sys_syncfs /* 500 */ .quad sys_setns .quad sys_accept4 + .quad sys_sendmmsg .size sys_call_table, . - sys_call_table .type sys_call_table, @object -- cgit v1.2.3