diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-11-13 14:28:40 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-13 14:28:40 +1100 |
| commit | 64c911a3f7c9864a4bbddbb77b722d5553ddcd32 (patch) | |
| tree | 66439e7291710ce45c36c49eeb4a8ffeb068cc16 /arch | |
| parent | ACPI: add documentation for deprecated /proc/acpi/battery in ACPI_PROCFS (diff) | |
| parent | [POWERPC] Fix oops related to 4xx flush_tlb_page modification (diff) | |
| download | linux-dev-64c911a3f7c9864a4bbddbb77b722d5553ddcd32.tar.xz linux-dev-64c911a3f7c9864a4bbddbb77b722d5553ddcd32.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/Makefile | 3 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/cpm_common.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 4e165342210a..bd87626c1f60 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -107,6 +107,9 @@ endif # No AltiVec instruction when building kernel KBUILD_CFLAGS += $(call cc-option,-mno-altivec) +# No SPE instruction when building kernel +KBUILD_CFLAGS += $(call cc-option,-mno-spe) + # Enable unit-at-a-time mode when possible. It shrinks the # kernel considerably. KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 66c8ad4cfce6..165981c87786 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c @@ -77,8 +77,6 @@ int __init cpm_muram_init(void) int i = 0; int ret = 0; - printk("cpm_muram_init\n"); - spin_lock_init(&cpm_muram_lock); /* initialize the info header */ rh_init(&cpm_muram_info, 1, @@ -193,7 +191,7 @@ void __iomem *cpm_muram_addr(unsigned long offset) EXPORT_SYMBOL(cpm_muram_addr); /** - * cpm_muram_phys - turn a muram virtual address into a DMA address + * cpm_muram_dma - turn a muram virtual address into a DMA address * @offset: virtual address from cpm_muram_addr() to convert */ dma_addr_t cpm_muram_dma(void __iomem *addr) |