From 8623f77a192c7c71fc32f56db9da9e47a836dce8 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Fri, 25 Jul 2008 17:50:30 -0500
Subject: [PATCH] --- yaml --- r: 106130 b: refs/heads/master c:
 fc532f810832beb3306b42526a78f411972281c7 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/Makefile                       |  1 -
 trunk/arch/ia64/kernel/entry.S       |  6 ------
 trunk/arch/powerpc/kernel/cputable.c |  4 ++--
 trunk/arch/sparc/kernel/systbls.S    |  3 +--
 trunk/arch/sparc64/kernel/systbls.S  |  6 ++----
 trunk/drivers/char/Kconfig           |  8 --------
 trunk/drivers/char/Makefile          |  4 ++--
 trunk/drivers/char/vt.c              |  2 +-
 trunk/include/asm-alpha/kvm.h        |  6 ++++++
 trunk/include/asm-arm/kvm.h          |  6 ++++++
 trunk/include/asm-avr32/kvm.h        |  6 ++++++
 trunk/include/asm-blackfin/kvm.h     |  6 ++++++
 trunk/include/asm-cris/kvm.h         |  6 ++++++
 trunk/include/asm-frv/kvm.h          |  6 ++++++
 trunk/include/asm-generic/Kbuild.asm |  2 --
 trunk/include/asm-h8300/kvm.h        |  6 ++++++
 trunk/include/asm-ia64/unistd.h      |  8 +-------
 trunk/include/asm-m32r/kvm.h         |  6 ++++++
 trunk/include/asm-m68k/kvm.h         |  6 ++++++
 trunk/include/asm-m68knommu/kvm.h    |  6 ++++++
 trunk/include/asm-mips/kvm.h         |  6 ++++++
 trunk/include/asm-mn10300/kvm.h      |  6 ++++++
 trunk/include/asm-parisc/kvm.h       |  6 ++++++
 trunk/include/asm-s390/Kbuild        |  1 +
 trunk/include/asm-sh/kvm.h           |  6 ++++++
 trunk/include/asm-sparc/kvm.h        |  6 ++++++
 trunk/include/asm-sparc/unistd_32.h  |  8 +-------
 trunk/include/asm-sparc/unistd_64.h  |  8 +-------
 trunk/include/asm-sparc64/kvm.h      |  1 +
 trunk/include/asm-um/kvm.h           |  6 ++++++
 trunk/include/asm-x86/Kbuild         |  1 +
 trunk/include/asm-xtensa/kvm.h       |  6 ++++++
 trunk/include/linux/Kbuild           |  2 --
 trunk/include/linux/bootmem.h        |  9 +++++----
 trunk/include/linux/consolemap.h     | 14 --------------
 trunk/include/linux/syscalls.h       |  2 +-
 trunk/include/linux/vt_kern.h        | 19 -------------------
 trunk/kernel/sys_ni.c                |  1 -
 trunk/mm/hugetlb.c                   | 22 +++++++++++-----------
 trunk/scripts/Makefile.fwinst        | 10 ++++------
 41 files changed, 138 insertions(+), 108 deletions(-)
 create mode 100644 trunk/include/asm-alpha/kvm.h
 create mode 100644 trunk/include/asm-arm/kvm.h
 create mode 100644 trunk/include/asm-avr32/kvm.h
 create mode 100644 trunk/include/asm-blackfin/kvm.h
 create mode 100644 trunk/include/asm-cris/kvm.h
 create mode 100644 trunk/include/asm-frv/kvm.h
 create mode 100644 trunk/include/asm-h8300/kvm.h
 create mode 100644 trunk/include/asm-m32r/kvm.h
 create mode 100644 trunk/include/asm-m68k/kvm.h
 create mode 100644 trunk/include/asm-m68knommu/kvm.h
 create mode 100644 trunk/include/asm-mips/kvm.h
 create mode 100644 trunk/include/asm-mn10300/kvm.h
 create mode 100644 trunk/include/asm-parisc/kvm.h
 create mode 100644 trunk/include/asm-sh/kvm.h
 create mode 100644 trunk/include/asm-sparc/kvm.h
 create mode 100644 trunk/include/asm-sparc64/kvm.h
 create mode 100644 trunk/include/asm-um/kvm.h
 create mode 100644 trunk/include/asm-xtensa/kvm.h

diff --git a/[refs] b/[refs]
index 0b51a70eb8d5..23324c216fd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b35fa86e47f83db27056b202463d926ff0a2c8f
+refs/heads/master: fc532f810832beb3306b42526a78f411972281c7
diff --git a/trunk/Makefile b/trunk/Makefile
index 3cad7db5eba7..4bcd1cf90cb1 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1061,7 +1061,6 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
 	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
 	@echo '  Building modules, stage 2.';
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
 
 
 # Target to prepare building external modules
diff --git a/trunk/arch/ia64/kernel/entry.S b/trunk/arch/ia64/kernel/entry.S
index 0dd6c1419d8d..56ab156c48ae 100644
--- a/trunk/arch/ia64/kernel/entry.S
+++ b/trunk/arch/ia64/kernel/entry.S
@@ -1691,12 +1691,6 @@ sys_call_table:
 	data8 sys_timerfd_create		// 1310
 	data8 sys_timerfd_settime
 	data8 sys_timerfd_gettime
-	data8 sys_signalfd4
-	data8 sys_eventfd2
-	data8 sys_epoll_create1			// 1315
-	data8 sys_dup3
-	data8 sys_pipe2
-	data8 sys_inotify_init1
 
 	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index 25a052c16754..25c273c761d1 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/arch/powerpc/kernel/cputable.c
@@ -1660,8 +1660,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
 			 * Set the base platform string once; assumes
 			 * we're called with real pvr first.
 			 */
-			if (powerpc_base_platform == NULL)
-				powerpc_base_platform = t->platform;
+			if (*PTRRELOC(&powerpc_base_platform) == NULL)
+				*PTRRELOC(&powerpc_base_platform) = t->platform;
 
 #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
 			/* ppc64 and booke expect identify_cpu to also call
diff --git a/trunk/arch/sparc/kernel/systbls.S b/trunk/arch/sparc/kernel/systbls.S
index e1b9233b90ab..5a7c4c8345c3 100644
--- a/trunk/arch/sparc/kernel/systbls.S
+++ b/trunk/arch/sparc/kernel/systbls.S
@@ -80,5 +80,4 @@ sys_call_table:
 /*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy
 /*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 /*310*/	.long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
-/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/	.long sys_dup3, sys_pipe2, sys_inotify_init1
+/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime
diff --git a/trunk/arch/sparc64/kernel/systbls.S b/trunk/arch/sparc64/kernel/systbls.S
index 1095bf4c5100..8b5282d433c4 100644
--- a/trunk/arch/sparc64/kernel/systbls.S
+++ b/trunk/arch/sparc64/kernel/systbls.S
@@ -81,8 +81,7 @@ sys_call_table32:
 /*300*/	.word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages, compat_sys_mbind, compat_sys_get_mempolicy
 	.word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait
 /*310*/	.word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate
-	.word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1
+	.word compat_sys_timerfd_settime, compat_sys_timerfd_gettime
 
 #endif /* CONFIG_COMPAT */
 
@@ -155,5 +154,4 @@ sys_call_table:
 /*300*/	.word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy
 	.word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 /*310*/	.word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate
-	.word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1
-/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1
+	.word sys_timerfd_settime, sys_timerfd_gettime
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index d0ac944e1696..6c070dc5f2d4 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -36,14 +36,6 @@ config VT
 	  If unsure, say Y, or else you won't be able to do much with your new
 	  shiny Linux system :-)
 
-config CONSOLE_TRANSLATIONS
-	depends on VT
-	default y
-	bool "Enable character translations in console" if EMBEDDED
-	---help---
-	  This enables support for font mapping and Unicode translation
-	  on virtual consoles.
-
 config VT_CONSOLE
 	bool "Support for console on virtual terminal" if EMBEDDED
 	depends on VT
diff --git a/trunk/drivers/char/Makefile b/trunk/drivers/char/Makefile
index 8a161c30e1dc..f7a0d1a754fc 100644
--- a/trunk/drivers/char/Makefile
+++ b/trunk/drivers/char/Makefile
@@ -12,8 +12,8 @@ obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o
 obj-$(CONFIG_LEGACY_PTYS)	+= pty.o
 obj-$(CONFIG_UNIX98_PTYS)	+= pty.o
 obj-y				+= misc.o
-obj-$(CONFIG_VT)		+= vt_ioctl.o vc_screen.o selection.o keyboard.o
-obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
+obj-$(CONFIG_VT)		+= vt_ioctl.o vc_screen.o consolemap.o \
+				   consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE)	+= vt.o defkeymap.o
 obj-$(CONFIG_AUDIT)		+= tty_audit.o
 obj-$(CONFIG_MAGIC_SYSRQ)	+= sysrq.o
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 82a51f38a546..cb8c90da3934 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -2211,7 +2211,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 			c = 0xfffd;
 		    tc = c;
 		} else {	/* no utf or alternate charset mode */
-		    tc = vc_translate(vc, c);
+		    tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c];
 		}
 
 		param.c = tc;
diff --git a/trunk/include/asm-alpha/kvm.h b/trunk/include/asm-alpha/kvm.h
new file mode 100644
index 000000000000..b9daec429689
--- /dev/null
+++ b/trunk/include/asm-alpha/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_ALPHA_H
+#define __LINUX_KVM_ALPHA_H
+
+/* alpha does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-arm/kvm.h b/trunk/include/asm-arm/kvm.h
new file mode 100644
index 000000000000..cb3c08cbcb9e
--- /dev/null
+++ b/trunk/include/asm-arm/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_ARM_H
+#define __LINUX_KVM_ARM_H
+
+/* arm does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-avr32/kvm.h b/trunk/include/asm-avr32/kvm.h
new file mode 100644
index 000000000000..8c5777020e2c
--- /dev/null
+++ b/trunk/include/asm-avr32/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_AVR32_H
+#define __LINUX_KVM_AVR32_H
+
+/* avr32 does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-blackfin/kvm.h b/trunk/include/asm-blackfin/kvm.h
new file mode 100644
index 000000000000..e3477d77c014
--- /dev/null
+++ b/trunk/include/asm-blackfin/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_BLACKFIN_H
+#define __LINUX_KVM_BLACKFIN_H
+
+/* blackfin does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-cris/kvm.h b/trunk/include/asm-cris/kvm.h
new file mode 100644
index 000000000000..c860f51149f0
--- /dev/null
+++ b/trunk/include/asm-cris/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_CRIS_H
+#define __LINUX_KVM_CRIS_H
+
+/* cris does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-frv/kvm.h b/trunk/include/asm-frv/kvm.h
new file mode 100644
index 000000000000..9c8a4f08d0a9
--- /dev/null
+++ b/trunk/include/asm-frv/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_FRV_H
+#define __LINUX_KVM_FRV_H
+
+/* frv does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-generic/Kbuild.asm b/trunk/include/asm-generic/Kbuild.asm
index 1170dc60e638..7cd25b8e7c9a 100644
--- a/trunk/include/asm-generic/Kbuild.asm
+++ b/trunk/include/asm-generic/Kbuild.asm
@@ -1,6 +1,4 @@
-ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 header-y  += kvm.h
-endif
 
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 unifdef-y += a.out.h
diff --git a/trunk/include/asm-h8300/kvm.h b/trunk/include/asm-h8300/kvm.h
new file mode 100644
index 000000000000..bdbed7b987e1
--- /dev/null
+++ b/trunk/include/asm-h8300/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_H8300_H
+#define __LINUX_KVM_H8300_H
+
+/* h8300 does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-ia64/unistd.h b/trunk/include/asm-ia64/unistd.h
index d535833aab5e..e60314716122 100644
--- a/trunk/include/asm-ia64/unistd.h
+++ b/trunk/include/asm-ia64/unistd.h
@@ -302,17 +302,11 @@
 #define __NR_timerfd_create		1310
 #define __NR_timerfd_settime		1311
 #define __NR_timerfd_gettime		1312
-#define __NR_signalfd4			1313
-#define __NR_eventfd2			1314
-#define __NR_epoll_create1		1315
-#define __NR_dup3			1316
-#define __NR_pipe2			1317
-#define __NR_inotify_init1		1318
 
 #ifdef __KERNEL__
 
 
-#define NR_syscalls			295 /* length of syscall table */
+#define NR_syscalls			289 /* length of syscall table */
 
 /*
  * The following defines stop scripts/checksyscalls.sh from complaining about
diff --git a/trunk/include/asm-m32r/kvm.h b/trunk/include/asm-m32r/kvm.h
new file mode 100644
index 000000000000..99a40515b77e
--- /dev/null
+++ b/trunk/include/asm-m32r/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_M32R_H
+#define __LINUX_KVM_M32R_H
+
+/* m32r does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-m68k/kvm.h b/trunk/include/asm-m68k/kvm.h
new file mode 100644
index 000000000000..7ed27fce5240
--- /dev/null
+++ b/trunk/include/asm-m68k/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_M68K_H
+#define __LINUX_KVM_M68K_H
+
+/* m68k does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-m68knommu/kvm.h b/trunk/include/asm-m68knommu/kvm.h
new file mode 100644
index 000000000000..b49d4258dabb
--- /dev/null
+++ b/trunk/include/asm-m68knommu/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_M68KNOMMU_H
+#define __LINUX_KVM_M68KNOMMU_H
+
+/* m68knommu does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-mips/kvm.h b/trunk/include/asm-mips/kvm.h
new file mode 100644
index 000000000000..093a5b7f796b
--- /dev/null
+++ b/trunk/include/asm-mips/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_MIPS_H
+#define __LINUX_KVM_MIPS_H
+
+/* mips does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-mn10300/kvm.h b/trunk/include/asm-mn10300/kvm.h
new file mode 100644
index 000000000000..f6b609ff4a57
--- /dev/null
+++ b/trunk/include/asm-mn10300/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_MN10300_H
+#define __LINUX_KVM_MN10300_H
+
+/* mn10300 does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-parisc/kvm.h b/trunk/include/asm-parisc/kvm.h
new file mode 100644
index 000000000000..00cc45812547
--- /dev/null
+++ b/trunk/include/asm-parisc/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_PARISC_H
+#define __LINUX_KVM_PARISC_H
+
+/* parisc does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-s390/Kbuild b/trunk/include/asm-s390/Kbuild
index 63a23415fba6..bb5e9edb9825 100644
--- a/trunk/include/asm-s390/Kbuild
+++ b/trunk/include/asm-s390/Kbuild
@@ -7,6 +7,7 @@ header-y += tape390.h
 header-y += ucontext.h
 header-y += vtoc.h
 header-y += zcrypt.h
+header-y += kvm.h
 header-y += chsc.h
 
 unifdef-y += cmb.h
diff --git a/trunk/include/asm-sh/kvm.h b/trunk/include/asm-sh/kvm.h
new file mode 100644
index 000000000000..6af51dbab2d0
--- /dev/null
+++ b/trunk/include/asm-sh/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_SH_H
+#define __LINUX_KVM_SH_H
+
+/* sh does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-sparc/kvm.h b/trunk/include/asm-sparc/kvm.h
new file mode 100644
index 000000000000..2e5478da3819
--- /dev/null
+++ b/trunk/include/asm-sparc/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_SPARC_H
+#define __LINUX_KVM_SPARC_H
+
+/* sparc does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-sparc/unistd_32.h b/trunk/include/asm-sparc/unistd_32.h
index 648643a9f139..2338a0276377 100644
--- a/trunk/include/asm-sparc/unistd_32.h
+++ b/trunk/include/asm-sparc/unistd_32.h
@@ -332,14 +332,8 @@
 #define __NR_fallocate		314
 #define __NR_timerfd_settime	315
 #define __NR_timerfd_gettime	316
-#define __NR_signalfd4		317
-#define __NR_eventfd2		318
-#define __NR_epoll_create1	319
-#define __NR_dup3		320
-#define __NR_pipe2		321
-#define __NR_inotify_init1	322
 
-#define NR_SYSCALLS		323
+#define NR_SYSCALLS		317
 
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
  * it never had the plain ones and there is no value to adding those
diff --git a/trunk/include/asm-sparc/unistd_64.h b/trunk/include/asm-sparc/unistd_64.h
index c5cc0e052321..13be4453a1f0 100644
--- a/trunk/include/asm-sparc/unistd_64.h
+++ b/trunk/include/asm-sparc/unistd_64.h
@@ -334,14 +334,8 @@
 #define __NR_fallocate		314
 #define __NR_timerfd_settime	315
 #define __NR_timerfd_gettime	316
-#define __NR_signalfd4		317
-#define __NR_eventfd2		318
-#define __NR_epoll_create1	319
-#define __NR_dup3		320
-#define __NR_pipe2		321
-#define __NR_inotify_init1	322
 
-#define NR_SYSCALLS		323
+#define NR_SYSCALLS		317
 
 #ifdef __KERNEL__
 #define __ARCH_WANT_IPC_PARSE_VERSION
diff --git a/trunk/include/asm-sparc64/kvm.h b/trunk/include/asm-sparc64/kvm.h
new file mode 100644
index 000000000000..53564ad86b15
--- /dev/null
+++ b/trunk/include/asm-sparc64/kvm.h
@@ -0,0 +1 @@
+#include <asm-sparc/kvm.h>
diff --git a/trunk/include/asm-um/kvm.h b/trunk/include/asm-um/kvm.h
new file mode 100644
index 000000000000..66aa77094551
--- /dev/null
+++ b/trunk/include/asm-um/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_UM_H
+#define __LINUX_KVM_UM_H
+
+/* um does not support KVM */
+
+#endif
diff --git a/trunk/include/asm-x86/Kbuild b/trunk/include/asm-x86/Kbuild
index 4a8e80cdcfa5..00473f7dd819 100644
--- a/trunk/include/asm-x86/Kbuild
+++ b/trunk/include/asm-x86/Kbuild
@@ -3,6 +3,7 @@ include include/asm-generic/Kbuild.asm
 header-y += boot.h
 header-y += bootparam.h
 header-y += debugreg.h
+header-y += kvm.h
 header-y += ldt.h
 header-y += msr-index.h
 header-y += prctl.h
diff --git a/trunk/include/asm-xtensa/kvm.h b/trunk/include/asm-xtensa/kvm.h
new file mode 100644
index 000000000000..bda4e331e98c
--- /dev/null
+++ b/trunk/include/asm-xtensa/kvm.h
@@ -0,0 +1,6 @@
+#ifndef __LINUX_KVM_XTENSA_H
+#define __LINUX_KVM_XTENSA_H
+
+/* xtensa does not support KVM */
+
+#endif
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 4c4142c5aa6e..a18008ce7aba 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -255,9 +255,7 @@ unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
-ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 unifdef-y += kvm.h
-endif
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h
diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h
index 652470b687c9..4ddf2922fc8d 100644
--- a/trunk/include/linux/bootmem.h
+++ b/trunk/include/linux/bootmem.h
@@ -103,16 +103,17 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
 	__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages(x) \
 	__alloc_bootmem_low(x, PAGE_SIZE, 0)
+#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
+
+extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
+				   int flags);
+
 #define alloc_bootmem_node(pgdat, x) \
 	__alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages_node(pgdat, x) \
 	__alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages_node(pgdat, x) \
 	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
-#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
-
-extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
-				   int flags);
 
 extern void *alloc_bootmem_section(unsigned long size,
 				   unsigned long section_nr);
diff --git a/trunk/include/linux/consolemap.h b/trunk/include/linux/consolemap.h
index c4811da1338b..e2bf7e5db39a 100644
--- a/trunk/include/linux/consolemap.h
+++ b/trunk/include/linux/consolemap.h
@@ -3,9 +3,6 @@
  *
  * Interface between console.c, selection.c  and consolemap.c
  */
-#ifndef __LINUX_CONSOLEMAP_H__
-#define __LINUX_CONSOLEMAP_H__
-
 #define LAT1_MAP 0
 #define GRAF_MAP 1
 #define IBMPC_MAP 2
@@ -13,7 +10,6 @@
 
 #include <linux/types.h>
 
-#ifdef CONFIG_CONSOLE_TRANSLATIONS
 struct vc_data;
 
 extern u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode);
@@ -22,13 +18,3 @@ extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
 extern u32 conv_8bit_to_uni(unsigned char c);
 extern int conv_uni_to_8bit(u32 uni);
 void console_map_init(void);
-#else
-#define inverse_translate(conp, glyph, uni) ((uint16_t)glyph)
-#define set_translate(m, vc) ((unsigned short *)NULL)
-#define conv_uni_to_pc(conp, ucs) ((int) (ucs > 0xff ? -1: ucs))
-#define conv_8bit_to_uni(c) ((uint32_t)(c))
-#define conv_uni_to_8bit(c) ((int) ((c) & 0xff))
-#define console_map_init(c) do { ; } while (0)
-#endif /* CONFIG_CONSOLE_TRANSLATIONS */
-
-#endif /* __LINUX_CONSOLEMAP_H__ */
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
index d6ff145919ca..06f2bf76c030 100644
--- a/trunk/include/linux/syscalls.h
+++ b/trunk/include/linux/syscalls.h
@@ -411,7 +411,7 @@ asmlinkage long sys_bind(int, struct sockaddr __user *, int);
 asmlinkage long sys_connect(int, struct sockaddr __user *, int);
 asmlinkage long sys_accept(int, struct sockaddr __user *, int __user *);
 asmlinkage long sys_paccept(int, struct sockaddr __user *, int __user *,
-			    const __user sigset_t *, size_t, int);
+			    const sigset_t *, size_t, int);
 asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
diff --git a/trunk/include/linux/vt_kern.h b/trunk/include/linux/vt_kern.h
index 14c0e91be9b5..9448ffbdcbf6 100644
--- a/trunk/include/linux/vt_kern.h
+++ b/trunk/include/linux/vt_kern.h
@@ -12,7 +12,6 @@
 #include <linux/mutex.h>
 #include <linux/console_struct.h>
 #include <linux/mm.h>
-#include <linux/consolemap.h>
 
 /*
  * Presently, a lot of graphics programs do not restore the contents of
@@ -55,7 +54,6 @@ void redraw_screen(struct vc_data *vc, int is_switch);
 struct tty_struct;
 int tioclinux(struct tty_struct *tty, unsigned long arg);
 
-#ifdef CONFIG_CONSOLE_TRANSLATIONS
 /* consolemap.c */
 
 struct unimapinit;
@@ -73,23 +71,6 @@ void con_free_unimap(struct vc_data *vc);
 void con_protect_unimap(struct vc_data *vc, int rdonly);
 int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 
-#define vc_translate(vc, c) ((vc)->vc_translate[(c) |			\
-					(vc)->vc_toggle_meta ? 0x80 : 0])
-#else
-#define con_set_trans_old(arg) (0)
-#define con_get_trans_old(arg) (-EINVAL)
-#define con_set_trans_new(arg) (0)
-#define con_get_trans_new(arg) (-EINVAL)
-#define con_clear_unimap(vc, ui) (0)
-#define con_set_unimap(vc, ct, list) (0)
-#define con_set_default_unimap(vc) (0)
-#define con_copy_unimap(d, s) (0)
-#define con_get_unimap(vc, ct, uct, list) (-EINVAL)
-#define con_free_unimap(vc) do { ; } while (0)
-
-#define vc_translate(vc, c) (c)
-#endif
-
 /* vt.c */
 int vt_waitactive(int vt);
 void change_console(struct vc_data *new_vc);
diff --git a/trunk/kernel/sys_ni.c b/trunk/kernel/sys_ni.c
index 08d6e1bb99ac..55eca1594da9 100644
--- a/trunk/kernel/sys_ni.c
+++ b/trunk/kernel/sys_ni.c
@@ -160,7 +160,6 @@ cond_syscall(sys_ioprio_get);
 cond_syscall(sys_signalfd);
 cond_syscall(sys_signalfd4);
 cond_syscall(compat_sys_signalfd);
-cond_syscall(compat_sys_signalfd4);
 cond_syscall(sys_timerfd_create);
 cond_syscall(sys_timerfd_settime);
 cond_syscall(sys_timerfd_gettime);
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index a8bf4ab01f86..41341c414194 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -1026,17 +1026,6 @@ static void __init report_hugepages(void)
 	}
 }
 
-static unsigned int cpuset_mems_nr(unsigned int *array)
-{
-	int node;
-	unsigned int nr = 0;
-
-	for_each_node_mask(node, cpuset_current_mems_allowed)
-		nr += array[node];
-
-	return nr;
-}
-
 #ifdef CONFIG_SYSCTL
 #ifdef CONFIG_HIGHMEM
 static void try_to_free_low(struct hstate *h, unsigned long count)
@@ -1386,6 +1375,17 @@ static int __init hugetlb_default_setup(char *s)
 }
 __setup("default_hugepagesz=", hugetlb_default_setup);
 
+static unsigned int cpuset_mems_nr(unsigned int *array)
+{
+	int node;
+	unsigned int nr = 0;
+
+	for_each_node_mask(node, cpuset_current_mems_allowed)
+		nr += array[node];
+
+	return nr;
+}
+
 int hugetlb_sysctl_handler(struct ctl_table *table, int write,
 			   struct file *file, void __user *buffer,
 			   size_t *length, loff_t *ppos)
diff --git a/trunk/scripts/Makefile.fwinst b/trunk/scripts/Makefile.fwinst
index f63a663de158..c972c0f54ce0 100644
--- a/trunk/scripts/Makefile.fwinst
+++ b/trunk/scripts/Makefile.fwinst
@@ -17,15 +17,14 @@ include $(srctree)/$(obj)/Makefile
 
 include scripts/Makefile.host
 
-mod-fw := $(fw-shipped-m)
+mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-m))
+
 # If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the 
 # firmware for in-kernel drivers too.
 ifndef CONFIG_FIRMWARE_IN_KERNEL
-mod-fw += $(fw-shipped-y)
+mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y))
 endif
 
-installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
-
 installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
 installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
 
@@ -50,8 +49,7 @@ PHONY +=  __fw_install __fw_modinst FORCE
 .PHONY: $(PHONY)
 
 __fw_install: $(installed-fw)
-__fw_modinst: $(installed-mod-fw)
-__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
+__fw_modinst: $(mod-fw)
 
 FORCE: