Skip to contentSkip to conversation

x86 fixes

GIT PULL Ingo Molnar 1 participant 1 message Apr 16, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

# HEAD: 5be44a6fb1edb57d7d2d77151870dcd79c8c0e58 x86: Remove the PCI reboot method from the default chain

Various fixes:

- reboot regression fix
- build message spam fix
- GPU quirk fix
- 'make kvmconfig' fix

Plus the wire-up of the renameat2() system call on i386.

out-of-topic modifications in x86-urgent-for-linus:
-----------------------------------------------------
include/linux/reboot.h # 5be44a6: x86: Remove the PCI reboot method

Thanks,

Ingo

------------------>
Antonio Borneo (1):
x86/platform: Fix "make O=dir kvmconfig"

Ingo Molnar (1):
x86: Remove the PCI reboot method from the default chain

Masahiro Yamada (1):
x86/build: Supress "Nothing to be done for ..." messages

Miklos Szeredi (1):
i386: Wire up the renameat2() syscall

Ville Syrjälä (1):
x86/gpu: Fix sign extension issue in Intel graphics stolen memory quirks

 arch/x86/Makefile                |  4 +--
 arch/x86/kernel/early-quirks.c   |  2 +-
 arch/x86/kernel/reboot.c         | 72 +++++++++++++++++++++-------------------
 arch/x86/syscalls/Makefile       |  2 ++
 arch/x86/syscalls/syscall_32.tbl |  1 +
 arch/x86/tools/Makefile          |  2 ++
 include/linux/reboot.h           | 14 ++++----
 7 files changed, 52 insertions(+), 45 deletions(-)
arch/x86/Makefile +2 -2
index 3b9348a..0db8910 100644
@@ -250,8 +250,8 @@ archclean:
 PHONY += kvmconfig
 kvmconfig:
 	$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config
-	$(Q)yes "" | $(MAKE) oldconfig
+	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config
+	$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'
arch/x86/kernel/early-quirks.c +1 -1
index b0cc380..6e2537c 100644
@@ -240,7 +240,7 @@ static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_s
 	return base;
 }
 
-#define KB(x)	((x) * 1024)
+#define KB(x)	((x) * 1024UL)
 #define MB(x)	(KB (KB (x)))
 #define GB(x)	(MB (KB (x)))
 
arch/x86/kernel/reboot.c +37 -35

121 lines not on this page · raw message

arch/x86/syscalls/Makefile +2 -0
index f325af2..3323c27 100644
@@ -54,5 +54,7 @@ syshdr-$(CONFIG_X86_64)		+= syscalls_64.h
 
 targets	+= $(uapisyshdr-y) $(syshdr-y)
 
+PHONY += all
 all: $(addprefix $(uapi)/,$(uapisyshdr-y))
 all: $(addprefix $(out)/,$(syshdr-y))
+	@:
arch/x86/syscalls/syscall_32.tbl +1 -0
index 96bc506..d6b8679 100644
@@ -359,3 +359,4 @@
 350	i386	finit_module		sys_finit_module
 351	i386	sched_setattr		sys_sched_setattr
 352	i386	sched_getattr		sys_sched_getattr
+353	i386	renameat2		sys_renameat2
arch/x86/tools/Makefile +2 -0
index e812034..604a37e 100644
@@ -40,4 +40,6 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/ina
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 hostprogs-y	+= relocs
 relocs-objs     := relocs_32.o relocs_64.o relocs_common.o
+PHONY += relocs
 relocs: $(obj)/relocs
+	@:
include/linux/reboot.h +7 -7
index 9e7db9e..48bf152 100644
@@ -20,13 +20,13 @@ enum reboot_mode {
 extern enum reboot_mode reboot_mode;
 
 enum reboot_type {
-	BOOT_TRIPLE = 't',
-	BOOT_KBD = 'k',
-	BOOT_BIOS = 'b',
-	BOOT_ACPI = 'a',
-	BOOT_EFI = 'e',
-	BOOT_CF9 = 'p',
-	BOOT_CF9_COND = 'q',
+	BOOT_TRIPLE	= 't',
+	BOOT_KBD	= 'k',
+	BOOT_BIOS	= 'b',
+	BOOT_ACPI	= 'a',
+	BOOT_EFI	= 'e',
+	BOOT_CF9_FORCE	= 'p',
+	BOOT_CF9_SAFE	= 'q',
 };
 extern enum reboot_type reboot_type;