Commit 45ea2103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
  x86: fix setup printk format warning
  x86: olpc build fix
  x86: video/fbdev.c: add MODULE_LICENSE
  x86: fix up bootparam.h for userspace inclusion
  x86: relocs ELF handling - use SELFMAG instead of numeric constant
  x86: vdso ELF handling - use SELFMAG instead of numeric constant
  x86: remove dell reboot dmi quirk board name match
  x86: es7000 build fix
  x86: make additional_cpus static
  x86: make start_secondary() static
  kbuild, suspend, x86: fix rebuild of wakeup.bin
  uml: fix gcc problem
  x86: undo visws/numaq build changes
parents 10ea18f0 62179849

arch/um/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) 
KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \

			 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))

KBUILD_CFLAGS += $(KERNEL_DEFINES)

KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)

# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use

# a lot more stack due to the lack of sharing of stacklots:

KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \

			echo $(call cc-option,-fno-unit-at-a-time); fi ;)



PHONY += linux

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER 


config OLPC

	bool "One Laptop Per Child support"

	depends on MGEODE_LX

	default n

	help

	  Add support for detecting the unique features of the OLPC

arch/x86/boot/compressed/relocs.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void read_ehdr(FILE *fp) 
		die("Cannot read ELF header: %s\n",

			strerror(errno));

	}

	if (memcmp(ehdr.e_ident, ELFMAG, 4) != 0) {

	if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {

		die("No ELF magic\n");

	}

	if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {

arch/x86/kernel/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ endif 
$(obj)/wakeup_rm.o:    $(obj)/realmode/wakeup.bin



$(obj)/realmode/wakeup.bin: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/realmode $@

	$(Q)$(MAKE) $(build)=$(obj)/realmode

arch/x86/kernel/acpi/realmode/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
# for more details.

#



targets		:= wakeup.bin wakeup.elf

always		:= wakeup.bin

targets		:= wakeup.elf wakeup.lds



wakeup-y	+= wakeup.o wakemain.o video-mode.o copy.o
@@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf := -T 


CPPFLAGS_wakeup.lds += -P -C



$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE

$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE

	$(call if_changed,ld)



OBJCOPYFLAGS_wakeup.bin	:= -O binary

CRA Git | Maintained and supported by SUSTech CRA and CCSE