Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 19:25:42 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 19:25:42 +0000 (12:25 -0700)
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Move olpc to platform
  x86: Move uv to platform
  x86: Move mrst to platform
  x86: Move scx200 to platform
  x86: Move visws to platform
  x86: Move efi to platform
  x86: Move sfi to platform
  x86: Add platform directory

27 files changed:
arch/x86/Kbuild
arch/x86/kernel/Makefile
arch/x86/platform/Makefile [new file with mode: 0644]
arch/x86/platform/efi/Makefile [new file with mode: 0644]
arch/x86/platform/efi/efi.c [moved from arch/x86/kernel/efi.c with 100% similarity]
arch/x86/platform/efi/efi_32.c [moved from arch/x86/kernel/efi_32.c with 100% similarity]
arch/x86/platform/efi/efi_64.c [moved from arch/x86/kernel/efi_64.c with 100% similarity]
arch/x86/platform/efi/efi_stub_32.S [moved from arch/x86/kernel/efi_stub_32.S with 100% similarity]
arch/x86/platform/efi/efi_stub_64.S [moved from arch/x86/kernel/efi_stub_64.S with 100% similarity]
arch/x86/platform/mrst/Makefile [new file with mode: 0644]
arch/x86/platform/mrst/mrst.c [moved from arch/x86/kernel/mrst.c with 100% similarity]
arch/x86/platform/olpc/Makefile [new file with mode: 0644]
arch/x86/platform/olpc/olpc-xo1.c [moved from arch/x86/kernel/olpc-xo1.c with 100% similarity]
arch/x86/platform/olpc/olpc.c [moved from arch/x86/kernel/olpc.c with 100% similarity]
arch/x86/platform/olpc/olpc_ofw.c [moved from arch/x86/kernel/olpc_ofw.c with 100% similarity]
arch/x86/platform/scx200/Makefile [new file with mode: 0644]
arch/x86/platform/scx200/scx200_32.c [moved from arch/x86/kernel/scx200_32.c with 100% similarity]
arch/x86/platform/sfi/Makefile [new file with mode: 0644]
arch/x86/platform/sfi/sfi.c [moved from arch/x86/kernel/sfi.c with 100% similarity]
arch/x86/platform/uv/Makefile [new file with mode: 0644]
arch/x86/platform/uv/bios_uv.c [moved from arch/x86/kernel/bios_uv.c with 100% similarity]
arch/x86/platform/uv/tlb_uv.c [moved from arch/x86/kernel/tlb_uv.c with 100% similarity]
arch/x86/platform/uv/uv_irq.c [moved from arch/x86/kernel/uv_irq.c with 100% similarity]
arch/x86/platform/uv/uv_sysfs.c [moved from arch/x86/kernel/uv_sysfs.c with 100% similarity]
arch/x86/platform/uv/uv_time.c [moved from arch/x86/kernel/uv_time.c with 100% similarity]
arch/x86/platform/visws/Makefile [new file with mode: 0644]
arch/x86/platform/visws/visws_quirks.c [moved from arch/x86/kernel/visws_quirks.c with 100% similarity]

index ad8ec35..0e10323 100644 (file)
@@ -14,3 +14,4 @@ obj-y += crypto/
 obj-y += vdso/
 obj-$(CONFIG_IA32_EMULATION) += ia32/
 
+obj-y += platform/
index 2c833d8..9e13763 100644 (file)
@@ -36,7 +36,6 @@ obj-y                 += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y                  += time.o ioport.o ldt.o dumpstack.o
 obj-y                  += setup.o x86_init.o i8259.o irqinit.o jump_label.o
 obj-$(CONFIG_IRQ_WORK)  += irq_work.o
-obj-$(CONFIG_X86_VISWS)        += visws_quirks.o
 obj-$(CONFIG_X86_32)   += probe_roms_32.o
 obj-$(CONFIG_X86_32)   += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)   += sys_x86_64.o x8664_ksyms_64.o
@@ -58,7 +57,6 @@ obj-$(CONFIG_INTEL_TXT)               += tboot.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-y                          += cpu/
 obj-y                          += acpi/
-obj-$(CONFIG_SFI)              += sfi.o
 obj-y                          += reboot.o
 obj-$(CONFIG_MCA)              += mca_32.o
 obj-$(CONFIG_X86_MSR)          += msr.o
@@ -82,7 +80,6 @@ obj-$(CONFIG_KEXEC)           += relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump_$(BITS).o
 obj-$(CONFIG_KPROBES)          += kprobes.o
 obj-$(CONFIG_MODULES)          += module.o
-obj-$(CONFIG_EFI)              += efi.o efi_$(BITS).o efi_stub_$(BITS).o
 obj-$(CONFIG_DOUBLEFAULT)      += doublefault_32.o
 obj-$(CONFIG_KGDB)             += kgdb.o
 obj-$(CONFIG_VM86)             += vm86_32.o
@@ -104,14 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK)       += pvclock.o
 
 obj-$(CONFIG_PCSPKR_PLATFORM)  += pcspeaker.o
 
-obj-$(CONFIG_SCx200)           += scx200.o
-scx200-y                       += scx200_32.o
-
-obj-$(CONFIG_OLPC)             += olpc.o
-obj-$(CONFIG_OLPC_XO1)         += olpc-xo1.o
-obj-$(CONFIG_OLPC_OPENFIRMWARE)        += olpc_ofw.o
-obj-$(CONFIG_X86_MRST)         += mrst.o
-
 microcode-y                            := microcode_core.o
 microcode-$(CONFIG_MICROCODE_INTEL)    += microcode_intel.o
 microcode-$(CONFIG_MICROCODE_AMD)      += microcode_amd.o
@@ -124,7 +113,6 @@ obj-$(CONFIG_SWIOTLB)                       += pci-swiotlb.o
 ###
 # 64 bit specific files
 ifeq ($(CONFIG_X86_64),y)
-       obj-$(CONFIG_X86_UV)            += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o
        obj-$(CONFIG_AUDIT)             += audit_64.o
 
        obj-$(CONFIG_GART_IOMMU)        += pci-gart_64.o aperture_64.o
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
new file mode 100644 (file)
index 0000000..7bf70b8
--- /dev/null
@@ -0,0 +1,8 @@
+# Platform specific code goes here
+obj-y  += efi/
+obj-y  += mrst/
+obj-y  += olpc/
+obj-y  += scx200/
+obj-y  += sfi/
+obj-y  += visws/
+obj-y  += uv/
diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
new file mode 100644 (file)
index 0000000..73b8be0
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_EFI)              += efi.o efi_$(BITS).o efi_stub_$(BITS).o
diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile
new file mode 100644 (file)
index 0000000..efbbc55
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_MRST)         += mrst.o
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile
new file mode 100644 (file)
index 0000000..c31b8fc
--- /dev/null
@@ -0,0 +1,3 @@
+obj-$(CONFIG_OLPC)             += olpc.o
+obj-$(CONFIG_OLPC_XO1)         += olpc-xo1.o
+obj-$(CONFIG_OLPC_OPENFIRMWARE)        += olpc_ofw.o
diff --git a/arch/x86/platform/scx200/Makefile b/arch/x86/platform/scx200/Makefile
new file mode 100644 (file)
index 0000000..762b4c7
--- /dev/null
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SCx200)           += scx200.o
+scx200-y                       += scx200_32.o
diff --git a/arch/x86/platform/sfi/Makefile b/arch/x86/platform/sfi/Makefile
new file mode 100644 (file)
index 0000000..cc5db11
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_SFI)              += sfi.o
diff --git a/arch/x86/platform/uv/Makefile b/arch/x86/platform/uv/Makefile
new file mode 100644 (file)
index 0000000..6c40995
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_UV)           += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o
diff --git a/arch/x86/platform/visws/Makefile b/arch/x86/platform/visws/Makefile
new file mode 100644 (file)
index 0000000..91bc17a
--- /dev/null
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_VISWS)        += visws_quirks.o