Commit d2fc0bac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (78 commits)
  x86: fix RTC lockdep warning: potential hardirq recursion
  x86: cpa, micro-optimization
  x86: cpa, clean up code flow
  x86: cpa, eliminate CPA_ enum
  x86: cpa, cleanups
  x86: implement gbpages support in change_page_attr()
  x86: support gbpages in pagetable dump
  x86: add gbpages support to lookup_address
  x86: add pgtable accessor functions for gbpages
  x86: add PUD_PAGE_SIZE
  x86: add feature macros for the gbpages cpuid bit
  x86: switch direct mapping setup over to set_pte
  x86: fix page-present check in cpa_flush_range
  x86: remove cpa warning
  x86: remove now unused clear_kernel_mapping
  x86: switch pci-gart over to using set_memory_np() instead of clear_kernel_mapping()
  x86: cpa selftest, skip non present entries
  x86: CPA fix pagetable split
  x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
  x86: cpa, fix lookup_address
  ...
parents 93890b71 795d45b2

Documentation/x86_64/00-INDEX

0 → 100644
+16 −0
Original line number Diff line number Diff line 
00-INDEX

	- This file

boot-options.txt

	- AMD64-specific boot options.

cpu-hotplug-spec

	- Firmware support for CPU hotplug under Linux/x86-64

fake-numa-for-cpusets

	- Using numa=fake and CPUSets for Resource Management

kernel-stacks

	- Context-specific per-processor interrupt stacks.

machinecheck

	- Configurable sysfs parameters for the x86-64 machine check code.

mm.txt

	- Memory layout of x86-64 (4 level page tables, 46 bits physical).

uefi.txt

	- Booting Linux via Unified Extensible Firmware Interface.

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ config X86_RDC321X 
	select M486

	select X86_REBOOTFIXUPS

	select GENERIC_GPIO

	select LEDS_CLASS

	select LEDS_GPIO

	help

	  This option is needed for RDC R-321x system-on-chip, also known

arch/x86/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) 
KBUILD_CFLAGS += $(cfi) $(cfi-sigframe)



LDFLAGS := -m elf_$(UTS_MACHINE)

OBJCOPYFLAGS := -O binary -R .note -R .comment -S



# Speed up the build

KBUILD_CFLAGS += -pipe

arch/x86/boot/Makefile

+13 −5
Original line number Diff line number Diff line
@@ -43,9 +43,17 @@ setup-y += video-vesa.o 
setup-y		+= video-bios.o



targets		+= $(setup-y)

hostprogs-y	:= tools/build

hostprogs-y	:= mkcpustr tools/build



HOSTCFLAGS_build.o := $(LINUXINCLUDE)

HOST_EXTRACFLAGS += $(LINUXINCLUDE)



$(obj)/cpu.o: $(obj)/cpustr.h



quiet_cmd_cpustr = CPUSTR  $@

      cmd_cpustr = $(obj)/mkcpustr > $@

targets		+= cpustr.h

$(obj)/cpustr.h: $(obj)/mkcpustr FORCE

	$(call if_changed,cpustr)



# ---------------------------------------------------------------------------
@@ -80,6 +88,7 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/setup.bin \ 
	$(call if_changed,image)

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



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

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

	$(call if_changed,objcopy)
@@ -90,7 +99,6 @@ $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE 
	$(call if_changed,ld)



OBJCOPYFLAGS_setup.bin	:= -O binary



$(obj)/setup.bin: $(obj)/setup.elf FORCE

	$(call if_changed,objcopy)

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ $(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $ 
	$(call if_changed,ld)

	@:



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

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)

CRA Git | Maintained and supported by SUSTech CRA and CCSE