redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

Browse source
This commit is contained in:
Paul Mackerras 2007-11-13 14:28:40 +11:00
parent 6e800af233 725fb29fd4
commit 64c911a3f7
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/Makefile
View file

@ -107,6 +107,9 @@ endif
# No AltiVec instruction when building kernel # No AltiVec instruction when building kernel
KBUILD_CFLAGS += $(call cc-option,-mno-altivec) 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 # Enable unit-at-a-time mode when possible. It shrinks the
# kernel considerably. # kernel considerably.
KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)

4
arch/powerpc/sysdev/cpm_common.c
View file

@ -77,8 +77,6 @@ int __init cpm_muram_init(void)
int i = 0; int i = 0;
int ret = 0; int ret = 0;
printk("cpm_muram_init\n");
spin_lock_init(&cpm_muram_lock); spin_lock_init(&cpm_muram_lock);
/* initialize the info header */ /* initialize the info header */
rh_init(&cpm_muram_info, 1, rh_init(&cpm_muram_info, 1,
@ -193,7 +191,7 @@ void __iomem *cpm_muram_addr(unsigned long offset)
EXPORT_SYMBOL(cpm_muram_addr); 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 * @offset: virtual address from cpm_muram_addr() to convert
*/ */
dma_addr_t cpm_muram_dma(void __iomem *addr) dma_addr_t cpm_muram_dma(void __iomem *addr)

4
include/asm-powerpc/tlbflush.h
View file

@ -44,13 +44,13 @@ static inline void flush_tlb_mm(struct mm_struct *mm)
static inline void flush_tlb_page(struct vm_area_struct *vma, static inline void flush_tlb_page(struct vm_area_struct *vma,
unsigned long vmaddr) unsigned long vmaddr)
{ {
_tlbie(vmaddr, vma->vm_mm->context.id); _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0);
} }
static inline void flush_tlb_page_nohash(struct vm_area_struct *vma, static inline void flush_tlb_page_nohash(struct vm_area_struct *vma,
unsigned long vmaddr) unsigned long vmaddr)
{ {
_tlbie(vmaddr, vma->vm_mm->context.id); _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0);
} }
static inline void flush_tlb_range(struct vm_area_struct *vma, static inline void flush_tlb_range(struct vm_area_struct *vma,