Commit cbff2904 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush ...@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush
_end enter_prom memcpy memset reloc_offset __secondary_hold _end enter_prom memcpy memset reloc_offset __secondary_hold
__secondary_hold_acknowledge __secondary_hold_spinloop __start __secondary_hold_acknowledge __secondary_hold_spinloop __start
strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
reloc_got2" reloc_got2 kernstart_addr"
NM="$1" NM="$1"
OBJ="$2" OBJ="$2"
......
...@@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) ...@@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
return; return;
} }
map_page(address, phys, flags); map_page(address, phys, pgprot_val(flags));
fixmaps++; fixmaps++;
} }
......
...@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) ...@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void)
return result; return result;
} }
lmb_add(start_addr, map.r1.size);
lmb_analyze();
result = online_pages(start_pfn, nr_pages); result = online_pages(start_pfn, nr_pages);
if (result) if (result)
......
...@@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) ...@@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
unsigned long flags; unsigned long flags;
u32 reg; u32 reg;
if (!mpic)
return;
spin_lock_irqsave(&mpic_lock, flags); spin_lock_irqsave(&mpic_lock, flags);
if (is_ipi) { if (is_ipi) {
reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
...@@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) ...@@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
spin_unlock_irqrestore(&mpic_lock, flags); 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) void mpic_setup_this_cpu(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Authors: Dave Boutcher <boutcher@us.ibm.com> * Authors: Dave Boutcher <boutcher@us.ibm.com>
* Ryan Arnold <ryanarn@us.ibm.com> * Ryan Arnold <ryanarn@us.ibm.com>
* Colin Devilbiss <devilbis@us.ibm.com> * Colin Devilbiss <devilbis@us.ibm.com>
* Stephen Rothwell <sfr@au1.ibm.com> * Stephen Rothwell
* *
* (C) Copyright 2000-2004 IBM Corporation * (C) Copyright 2000-2004 IBM Corporation
* *
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Authors: Dave Boutcher <boutcher@us.ibm.com> * Authors: Dave Boutcher <boutcher@us.ibm.com>
* Ryan Arnold <ryanarn@us.ibm.com> * Ryan Arnold <ryanarn@us.ibm.com>
* Colin Devilbiss <devilbis@us.ibm.com> * Colin Devilbiss <devilbis@us.ibm.com>
* Stephen Rothwell <sfr@au1.ibm.com> * Stephen Rothwell
* *
* (C) Copyright 2000-2004 IBM Corporation * (C) Copyright 2000-2004 IBM Corporation
* *
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Authors: Dave Boutcher <boutcher@us.ibm.com> * Authors: Dave Boutcher <boutcher@us.ibm.com>
* Ryan Arnold <ryanarn@us.ibm.com> * Ryan Arnold <ryanarn@us.ibm.com>
* Colin Devilbiss <devilbis@us.ibm.com> * Colin Devilbiss <devilbis@us.ibm.com>
* Stephen Rothwell <sfr@au1.ibm.com> * Stephen Rothwell
* *
* (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation * (C) Copyright 2000, 2001, 2002, 2003, 2004 IBM Corporation
* *
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Authors: Dave Boutcher <boutcher@us.ibm.com> * Authors: Dave Boutcher <boutcher@us.ibm.com>
* Ryan Arnold <ryanarn@us.ibm.com> * Ryan Arnold <ryanarn@us.ibm.com>
* Colin Devilbiss <devilbis@us.ibm.com> * Colin Devilbiss <devilbis@us.ibm.com>
* Stephen Rothwell <sfr@au1.ibm.com> * Stephen Rothwell
* *
* (C) Copyright 2000-2004 IBM Corporation * (C) Copyright 2000-2004 IBM Corporation
* *
......
...@@ -428,12 +428,11 @@ extern void mpic_init(struct mpic *mpic); ...@@ -428,12 +428,11 @@ extern void mpic_init(struct mpic *mpic);
*/ */
/* Change/Read the priority of an interrupt. Default is 8 for irqs and /* Change the priority of an interrupt. Default is 8 for irqs and
* 10 for IPIs. You can call this on both IPIs and IRQ numbers, but the * 10 for IPIs. You can call this on both IPIs and IRQ numbers, but the
* IPI number is then the offset'ed (linux irq number mapped to the IPI) * IPI number is then the offset'ed (linux irq number mapped to the IPI)
*/ */
extern void mpic_irq_set_priority(unsigned int irq, unsigned int pri); extern void mpic_irq_set_priority(unsigned int irq, unsigned int pri);
extern unsigned int mpic_irq_get_priority(unsigned int irq);
/* Setup a non-boot CPU */ /* Setup a non-boot CPU */
extern void mpic_setup_this_cpu(void); extern void mpic_setup_this_cpu(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment