patch-2.4.22 linux-2.4.22/arch/ppc64/kernel/iSeries_setup.c
Next file: linux-2.4.22/arch/ppc64/kernel/ioctl32.c
Previous file: linux-2.4.22/arch/ppc64/kernel/iSeries_IoMmTable.h
Back to the patch index
Back to the overall index
- Lines: 18
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/ppc64/kernel/iSeries_setup.c
- Orig date:
2003-06-13 07:51:31.000000000 -0700
diff -urN linux-2.4.21/arch/ppc64/kernel/iSeries_setup.c linux-2.4.22/arch/ppc64/kernel/iSeries_setup.c
@@ -49,6 +49,7 @@
#include <asm/proc_pmc.h>
#include <asm/perfmon.h>
#include <asm/iSeries/mf.h>
+#include <asm/cputable.h>
/* Function Prototypes */
@@ -249,7 +250,8 @@
{
unsigned long i;
unsigned long mem_blocks = 0;
- if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p))
+
+ if (cur_cpu_spec->cpu_features & CPU_FTR_SLB)
mem_blocks = iSeries_process_Regatta_mainstore_vpd( mb_array, max_entries );
else
mem_blocks = iSeries_process_Condor_mainstore_vpd( mb_array, max_entries );
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)