diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:25:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:25:42 -0400 |
commit | 2d3b07c07b39c4b7d9b6641052a02d996cd5d87c (patch) | |
tree | 38f0e2865cc6c1eac3311cdf7539853afd222f4b /arch/x86 | |
parent | 150cd843fac0160fce616fb3e5cbe64e9db7481e (diff) | |
parent | 8654b1c2de1465120974899fc1c8aa00e91d4b7e (diff) |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kbuild | 1 | ||||
-rw-r--r-- | arch/x86/kernel/Makefile | 12 | ||||
-rw-r--r-- | arch/x86/platform/Makefile | 8 | ||||
-rw-r--r-- | arch/x86/platform/efi/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/efi/efi.c (renamed from arch/x86/kernel/efi.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/efi/efi_32.c (renamed from arch/x86/kernel/efi_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/efi/efi_64.c (renamed from arch/x86/kernel/efi_64.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/efi/efi_stub_32.S (renamed from arch/x86/kernel/efi_stub_32.S) | 0 | ||||
-rw-r--r-- | arch/x86/platform/efi/efi_stub_64.S (renamed from arch/x86/kernel/efi_stub_64.S) | 0 | ||||
-rw-r--r-- | arch/x86/platform/mrst/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/mrst/mrst.c (renamed from arch/x86/kernel/mrst.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/olpc/Makefile | 3 | ||||
-rw-r--r-- | arch/x86/platform/olpc/olpc-xo1.c (renamed from arch/x86/kernel/olpc-xo1.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/olpc/olpc.c (renamed from arch/x86/kernel/olpc.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/olpc/olpc_ofw.c (renamed from arch/x86/kernel/olpc_ofw.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/scx200/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/platform/scx200/scx200_32.c (renamed from arch/x86/kernel/scx200_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/sfi/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/sfi/sfi.c (renamed from arch/x86/kernel/sfi.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/uv/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/uv/bios_uv.c (renamed from arch/x86/kernel/bios_uv.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/uv/tlb_uv.c (renamed from arch/x86/kernel/tlb_uv.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/uv/uv_irq.c (renamed from arch/x86/kernel/uv_irq.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/uv/uv_sysfs.c (renamed from arch/x86/kernel/uv_sysfs.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/uv/uv_time.c (renamed from arch/x86/kernel/uv_time.c) | 0 | ||||
-rw-r--r-- | arch/x86/platform/visws/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/visws/visws_quirks.c (renamed from arch/x86/kernel/visws_quirks.c) | 0 |
27 files changed, 19 insertions, 12 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index ad8ec356fb36..0e103236b754 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild | |||
@@ -14,3 +14,4 @@ obj-y += crypto/ | |||
14 | obj-y += vdso/ | 14 | obj-y += vdso/ |
15 | obj-$(CONFIG_IA32_EMULATION) += ia32/ | 15 | obj-$(CONFIG_IA32_EMULATION) += ia32/ |
16 | 16 | ||
17 | obj-y += platform/ | ||
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 2c833d8c4141..9e13763b6092 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -36,7 +36,6 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o | |||
36 | obj-y += time.o ioport.o ldt.o dumpstack.o | 36 | obj-y += time.o ioport.o ldt.o dumpstack.o |
37 | obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o | 37 | obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o |
38 | obj-$(CONFIG_IRQ_WORK) += irq_work.o | 38 | obj-$(CONFIG_IRQ_WORK) += irq_work.o |
39 | obj-$(CONFIG_X86_VISWS) += visws_quirks.o | ||
40 | obj-$(CONFIG_X86_32) += probe_roms_32.o | 39 | obj-$(CONFIG_X86_32) += probe_roms_32.o |
41 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o | 40 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o |
42 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o | 41 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |
@@ -58,7 +57,6 @@ obj-$(CONFIG_INTEL_TXT) += tboot.o | |||
58 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 57 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
59 | obj-y += cpu/ | 58 | obj-y += cpu/ |
60 | obj-y += acpi/ | 59 | obj-y += acpi/ |
61 | obj-$(CONFIG_SFI) += sfi.o | ||
62 | obj-y += reboot.o | 60 | obj-y += reboot.o |
63 | obj-$(CONFIG_MCA) += mca_32.o | 61 | obj-$(CONFIG_MCA) += mca_32.o |
64 | obj-$(CONFIG_X86_MSR) += msr.o | 62 | obj-$(CONFIG_X86_MSR) += msr.o |
@@ -82,7 +80,6 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o | |||
82 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o | 80 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o |
83 | obj-$(CONFIG_KPROBES) += kprobes.o | 81 | obj-$(CONFIG_KPROBES) += kprobes.o |
84 | obj-$(CONFIG_MODULES) += module.o | 82 | obj-$(CONFIG_MODULES) += module.o |
85 | obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o | ||
86 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o | 83 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o |
87 | obj-$(CONFIG_KGDB) += kgdb.o | 84 | obj-$(CONFIG_KGDB) += kgdb.o |
88 | obj-$(CONFIG_VM86) += vm86_32.o | 85 | obj-$(CONFIG_VM86) += vm86_32.o |
@@ -104,14 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o | |||
104 | 101 | ||
105 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 102 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
106 | 103 | ||
107 | obj-$(CONFIG_SCx200) += scx200.o | ||
108 | scx200-y += scx200_32.o | ||
109 | |||
110 | obj-$(CONFIG_OLPC) += olpc.o | ||
111 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | ||
112 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o | ||
113 | obj-$(CONFIG_X86_MRST) += mrst.o | ||
114 | |||
115 | microcode-y := microcode_core.o | 104 | microcode-y := microcode_core.o |
116 | microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o | 105 | microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o |
117 | microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o | 106 | microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o |
@@ -124,7 +113,6 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o | |||
124 | ### | 113 | ### |
125 | # 64 bit specific files | 114 | # 64 bit specific files |
126 | ifeq ($(CONFIG_X86_64),y) | 115 | ifeq ($(CONFIG_X86_64),y) |
127 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o | ||
128 | obj-$(CONFIG_AUDIT) += audit_64.o | 116 | obj-$(CONFIG_AUDIT) += audit_64.o |
129 | 117 | ||
130 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o | 118 | 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 index 000000000000..7bf70b812fa2 --- /dev/null +++ b/arch/x86/platform/Makefile | |||
@@ -0,0 +1,8 @@ | |||
1 | # Platform specific code goes here | ||
2 | obj-y += efi/ | ||
3 | obj-y += mrst/ | ||
4 | obj-y += olpc/ | ||
5 | obj-y += scx200/ | ||
6 | obj-y += sfi/ | ||
7 | obj-y += visws/ | ||
8 | obj-y += uv/ | ||
diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile new file mode 100644 index 000000000000..73b8be0f3675 --- /dev/null +++ b/arch/x86/platform/efi/Makefile | |||
@@ -0,0 +1 @@ | |||
obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o | |||
diff --git a/arch/x86/kernel/efi.c b/arch/x86/platform/efi/efi.c index 0fe27d7c6258..0fe27d7c6258 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/platform/efi/efi_32.c index 5cab48ee61a4..5cab48ee61a4 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/platform/efi/efi_32.c | |||
diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/platform/efi/efi_64.c index ac0621a7ac3d..ac0621a7ac3d 100644 --- a/arch/x86/kernel/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c | |||
diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S index fbe66e626c09..fbe66e626c09 100644 --- a/arch/x86/kernel/efi_stub_32.S +++ b/arch/x86/platform/efi/efi_stub_32.S | |||
diff --git a/arch/x86/kernel/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S index 4c07ccab8146..4c07ccab8146 100644 --- a/arch/x86/kernel/efi_stub_64.S +++ b/arch/x86/platform/efi/efi_stub_64.S | |||
diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile new file mode 100644 index 000000000000..efbbc552fa95 --- /dev/null +++ b/arch/x86/platform/mrst/Makefile | |||
@@ -0,0 +1 @@ | |||
obj-$(CONFIG_X86_MRST) += mrst.o | |||
diff --git a/arch/x86/kernel/mrst.c b/arch/x86/platform/mrst/mrst.c index 79ae68154e87..79ae68154e87 100644 --- a/arch/x86/kernel/mrst.c +++ b/arch/x86/platform/mrst/mrst.c | |||
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile new file mode 100644 index 000000000000..c31b8fcb5a86 --- /dev/null +++ b/arch/x86/platform/olpc/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | obj-$(CONFIG_OLPC) += olpc.o | ||
2 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | ||
3 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o | ||
diff --git a/arch/x86/kernel/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c index f5442c03abc3..f5442c03abc3 100644 --- a/arch/x86/kernel/olpc-xo1.c +++ b/arch/x86/platform/olpc/olpc-xo1.c | |||
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/platform/olpc/olpc.c index edaf3fe8dc5e..edaf3fe8dc5e 100644 --- a/arch/x86/kernel/olpc.c +++ b/arch/x86/platform/olpc/olpc.c | |||
diff --git a/arch/x86/kernel/olpc_ofw.c b/arch/x86/platform/olpc/olpc_ofw.c index 787320464379..787320464379 100644 --- a/arch/x86/kernel/olpc_ofw.c +++ b/arch/x86/platform/olpc/olpc_ofw.c | |||
diff --git a/arch/x86/platform/scx200/Makefile b/arch/x86/platform/scx200/Makefile new file mode 100644 index 000000000000..762b4c7f4314 --- /dev/null +++ b/arch/x86/platform/scx200/Makefile | |||
@@ -0,0 +1,2 @@ | |||
1 | obj-$(CONFIG_SCx200) += scx200.o | ||
2 | scx200-y += scx200_32.o | ||
diff --git a/arch/x86/kernel/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c index 7e004acbe526..7e004acbe526 100644 --- a/arch/x86/kernel/scx200_32.c +++ b/arch/x86/platform/scx200/scx200_32.c | |||
diff --git a/arch/x86/platform/sfi/Makefile b/arch/x86/platform/sfi/Makefile new file mode 100644 index 000000000000..cc5db1168a5e --- /dev/null +++ b/arch/x86/platform/sfi/Makefile | |||
@@ -0,0 +1 @@ | |||
obj-$(CONFIG_SFI) += sfi.o | |||
diff --git a/arch/x86/kernel/sfi.c b/arch/x86/platform/sfi/sfi.c index dd4c281ffe57..dd4c281ffe57 100644 --- a/arch/x86/kernel/sfi.c +++ b/arch/x86/platform/sfi/sfi.c | |||
diff --git a/arch/x86/platform/uv/Makefile b/arch/x86/platform/uv/Makefile new file mode 100644 index 000000000000..6c40995fefb8 --- /dev/null +++ b/arch/x86/platform/uv/Makefile | |||
@@ -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/kernel/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index 8bc57baaa9ad..8bc57baaa9ad 100644 --- a/arch/x86/kernel/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c | |||
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 20ea20a39e2a..20ea20a39e2a 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c | |||
diff --git a/arch/x86/kernel/uv_irq.c b/arch/x86/platform/uv/uv_irq.c index 7b24460917d5..7b24460917d5 100644 --- a/arch/x86/kernel/uv_irq.c +++ b/arch/x86/platform/uv/uv_irq.c | |||
diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c index 309c70fb7759..309c70fb7759 100644 --- a/arch/x86/kernel/uv_sysfs.c +++ b/arch/x86/platform/uv/uv_sysfs.c | |||
diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/platform/uv/uv_time.c index 56e421bc379b..56e421bc379b 100644 --- a/arch/x86/kernel/uv_time.c +++ b/arch/x86/platform/uv/uv_time.c | |||
diff --git a/arch/x86/platform/visws/Makefile b/arch/x86/platform/visws/Makefile new file mode 100644 index 000000000000..91bc17ab2fd5 --- /dev/null +++ b/arch/x86/platform/visws/Makefile | |||
@@ -0,0 +1 @@ | |||
obj-$(CONFIG_X86_VISWS) += visws_quirks.o | |||
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/platform/visws/visws_quirks.c index 3371bd053b89..3371bd053b89 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/platform/visws/visws_quirks.c | |||