diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-23 05:23:37 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-27 08:30:02 -0400 |
| commit | 329b84e42e3ee348b114fd0bfe4b2421e6139257 (patch) | |
| tree | 95fefceaf95025c4f06b0bce21bb49c4b34b3f6e /arch | |
| parent | 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba (diff) | |
x86: Move uv to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Travis <travis@sgi.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
| -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 |
8 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4e1f862dd688..08e2e4bf8398 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -117,7 +117,6 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o | |||
| 117 | ### | 117 | ### |
| 118 | # 64 bit specific files | 118 | # 64 bit specific files |
| 119 | ifeq ($(CONFIG_X86_64),y) | 119 | ifeq ($(CONFIG_X86_64),y) |
| 120 | obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o | ||
| 121 | obj-$(CONFIG_AUDIT) += audit_64.o | 120 | obj-$(CONFIG_AUDIT) += audit_64.o |
| 122 | 121 | ||
| 123 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o | 122 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o |
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 06761ed53747..8519b01f1acb 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile | |||
| @@ -4,3 +4,4 @@ obj-y += mrst/ | |||
| 4 | obj-y += scx200/ | 4 | obj-y += scx200/ |
| 5 | obj-y += sfi/ | 5 | obj-y += sfi/ |
| 6 | obj-y += visws/ | 6 | obj-y += visws/ |
| 7 | obj-y += uv/ | ||
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 | |||