ath6kl: fix fw capability parsing

[~andy/linux] / arch / powerpc / kernel / paca.c

diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index 41456ff55e14f6b1fb6868621e77650989f32d7b..0bb1f98613bab5041dcad6073eae70395db5970c 100644 (file)
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -11,13 +11,10 @@
 #include <linux/export.h>
 #include <linux/memblock.h>
 
-#include <asm/firmware.h>
 #include <asm/lppaca.h>
 #include <asm/paca.h>
 #include <asm/sections.h>
 #include <asm/pgtable.h>
-#include <asm/iseries/lpar_map.h>
-#include <asm/iseries/hv_types.h>
 #include <asm/kexec.h>
 
 /* This symbol is provided by the linker - let it fill in the paca
@@ -30,8 +27,8 @@ extern unsigned long __toc_start;
  * The structure which the hypervisor knows about - this structure
  * should not cross a page boundary.  The vpa_init/register_vpa call
  * is now known to fail if the lppaca structure crosses a page
- * boundary.  The lppaca is also used on legacy iSeries and POWER5
- * pSeries boxes.  The lppaca is 640 bytes long, and cannot readily
+ * boundary.  The lppaca is also used on POWER5 pSeries boxes.
+ * The lppaca is 640 bytes long, and cannot readily
  * change since the hypervisor knows its layout, so a 1kB alignment
  * will suffice to ensure that it doesn't cross a page boundary.
  */
@@ -183,12 +180,9 @@ void __init allocate_pacas(void)
        /*
         * We can't take SLB misses on the paca, and we want to access them
         * in real mode, so allocate them within the RMA and also within
-        * the first segment. On iSeries they must be within the area mapped
-        * by the HV, which is HvPagesToMap * HVPAGESIZE bytes.
+        * the first segment.
         */
        limit = min(0x10000000ULL, ppc64_rma_size);
-       if (firmware_has_feature(FW_FEATURE_ISERIES))
-               limit = min(limit, HvPagesToMap * HVPAGESIZE);
 
        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);