Commit 4ec9f7a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Half of the fixes are for various build time warnings triggered by
  randconfig builds. Most (but not all...) were harmless.

  There's also:

   - ACPI boundary condition fixes

   - UV platform fixes

   - defconfig updates

   - an AMD K6 CPU init fix

   - a %pOF printk format related preparatory change

   - .. and a warning fix related to the tlb/PCID changes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/devicetree: Convert to using %pOF instead of ->full_name
  x86/platform/uv/BAU: Disable BAU on single hub configurations
  x86/platform/intel-mid: Fix a format string overflow warning
  x86/platform: Add PCI dependency for PUNIT_ATOM_DEBUG
  x86/build: Silence the build with "make -s"
  x86/io: Add "memory" clobber to insb/insw/insl/outsb/outsw/outsl
  x86/fpu/math-emu: Avoid bogus -Wint-in-bool-context warning
  x86/fpu/math-emu: Fix possible uninitialized variable use
  perf/x86: Shut up false-positive -Wmaybe-uninitialized warning
  x86/defconfig: Remove stale, old Kconfig options
  x86/ioapic: Pass the correct data to unmask_ioapic_irq()
  x86/acpi: Prevent out of bound access caused by broken ACPI tables
  x86/mm, KVM: Fix warning when !CONFIG_PREEMPT_COUNT
  x86/platform/uv/BAU: Fix congested_response_us not taking effect
  x86/cpu: Use indirect call to measure performance in init_amd_k6()
parents e234b4a8 db15e7f2

arch/x86/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ config X86_DEBUG_FPU 


config PUNIT_ATOM_DEBUG

	tristate "ATOM Punit debug driver"

	depends on PCI

	select DEBUG_FS

	select IOSF_MBI

	---help---

arch/x86/boot/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -73,12 +73,13 @@ UBSAN_SANITIZE := n 
$(obj)/bzImage: asflags-y  := $(SVGA_MODE)



quiet_cmd_image = BUILD   $@

silent_redirect_image = >/dev/null

cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin \

			       $(obj)/zoffset.h $@

			       $(obj)/zoffset.h $@ $($(quiet)redirect_image)



$(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE

	$(call if_changed,image)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'

	@$(kecho) 'Kernel: $@ is ready' ' (#'`cat .version`')'



OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S

$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE

arch/x86/configs/i386_defconfig

+0 −3
Original line number Diff line number Diff line 
# CONFIG_64BIT is not set

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -125,7 +124,6 @@ CONFIG_NF_CONNTRACK_IPV4=y 
CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_ULOG=y

CONFIG_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_MANGLE=y
@@ -255,7 +253,6 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_UHCI_HCD=y

CONFIG_USB_PRINTER=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

arch/x86/configs/x86_64_defconfig

+0 −3
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -124,7 +123,6 @@ CONFIG_NF_CONNTRACK_IPV4=y 
CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_ULOG=y

CONFIG_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_MANGLE=y
@@ -251,7 +249,6 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_UHCI_HCD=y

CONFIG_USB_PRINTER=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

arch/x86/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ static void release_pmc_hardware(void) {} 


static bool check_hw_exists(void)

{

	u64 val, val_fail, val_new= ~0;

	int i, reg, reg_fail, ret = 0;

	u64 val, val_fail = -1, val_new= ~0;

	int i, reg, reg_fail = -1, ret = 0;

	int bios_fail = 0;

	int reg_safe = -1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE