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

Commit cbff2904 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] iSeries: Remove unused mail address
  [POWERPC] mpic: Fix use of uninitialized variable
  [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
  [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
  [POWERPC] PS3: Fix memory hotplug
parents 6483d152 8962cadb

arch/powerpc/kernel/prom_init_check.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush 
_end enter_prom memcpy memset reloc_offset __secondary_hold

__secondary_hold_acknowledge __secondary_hold_spinloop __start

strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224

reloc_got2"

reloc_got2 kernstart_addr"



NM="$1"

OBJ="$2"

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) 
		return;

	}



	map_page(address, phys, flags);

	map_page(address, phys, pgprot_val(flags));

	fixmaps++;

}

arch/powerpc/platforms/ps3/mm.c

+3 −0
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) 
		return result;

	}



	lmb_add(start_addr, map.r1.size);

	lmb_analyze();



	result = online_pages(start_pfn, nr_pages);



	if (result)

arch/powerpc/sysdev/mpic.c

+3 −17
Original line number Diff line number Diff line
@@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) 
	unsigned long flags;

	u32 reg;



	if (!mpic)

		return;



	spin_lock_irqsave(&mpic_lock, flags);

	if (is_ipi) {

		reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
@@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) 
	spin_unlock_irqrestore(&mpic_lock, flags);

}



unsigned int mpic_irq_get_priority(unsigned int irq)

{

	unsigned int is_ipi;

	struct mpic *mpic = mpic_find(irq, &is_ipi);

	unsigned int src = mpic_irq_to_hw(irq);

	unsigned long flags;

	u32 reg;



	spin_lock_irqsave(&mpic_lock, flags);

	if (is_ipi)

		reg = mpic_ipi_read(src = mpic->ipi_vecs[0]);

	else

		reg = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI));

	spin_unlock_irqrestore(&mpic_lock, flags);

	return (reg & MPIC_VECPRI_PRIORITY_MASK) >> MPIC_VECPRI_PRIORITY_SHIFT;

}



void mpic_setup_this_cpu(void)

{

#ifdef CONFIG_SMP

drivers/block/viodasd.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *  Authors: Dave Boutcher <boutcher@us.ibm.com>

 *           Ryan Arnold <ryanarn@us.ibm.com>

 *           Colin Devilbiss <devilbis@us.ibm.com>

 *           Stephen Rothwell <sfr@au1.ibm.com>

 *           Stephen Rothwell

 *

 * (C) Copyright 2000-2004 IBM Corporation

 *