Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64c911a3 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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

parents 6e800af2 725fb29f

arch/powerpc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/sysdev/cpm_common.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

include/asm-powerpc/tlbflush.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

				  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,

					 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,