diff options
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 074d1d949708..fd6d0ebe8ddd 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -90,8 +90,6 @@ extern unsigned long embedded_sysmap_end; | |||
90 | extern unsigned long iSeries_recal_tb; | 90 | extern unsigned long iSeries_recal_tb; |
91 | extern unsigned long iSeries_recal_titan; | 91 | extern unsigned long iSeries_recal_titan; |
92 | 92 | ||
93 | static unsigned long cmd_mem_limit; | ||
94 | |||
95 | struct MemoryBlock { | 93 | struct MemoryBlock { |
96 | unsigned long absStart; | 94 | unsigned long absStart; |
97 | unsigned long absEnd; | 95 | unsigned long absEnd; |
@@ -1026,8 +1024,6 @@ void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size) | |||
1026 | /* /chosen */ | 1024 | /* /chosen */ |
1027 | dt_start_node(dt, "chosen"); | 1025 | dt_start_node(dt, "chosen"); |
1028 | dt_prop_str(dt, "bootargs", cmd_line); | 1026 | dt_prop_str(dt, "bootargs", cmd_line); |
1029 | if (cmd_mem_limit) | ||
1030 | dt_prop_u64(dt, "linux,memory-limit", cmd_mem_limit); | ||
1031 | dt_end_node(dt); | 1027 | dt_end_node(dt); |
1032 | 1028 | ||
1033 | dt_cpus(dt); | 1029 | dt_cpus(dt); |
@@ -1053,29 +1049,11 @@ void * __init iSeries_early_setup(void) | |||
1053 | 1049 | ||
1054 | iSeries_get_cmdline(); | 1050 | iSeries_get_cmdline(); |
1055 | 1051 | ||
1056 | /* Save unparsed command line copy for /proc/cmdline */ | ||
1057 | strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); | ||
1058 | |||
1059 | /* Parse early parameters, in particular mem=x */ | ||
1060 | parse_early_param(); | ||
1061 | |||
1062 | build_flat_dt(&iseries_dt, phys_mem_size); | 1052 | build_flat_dt(&iseries_dt, phys_mem_size); |
1063 | 1053 | ||
1064 | return (void *) __pa(&iseries_dt); | 1054 | return (void *) __pa(&iseries_dt); |
1065 | } | 1055 | } |
1066 | 1056 | ||
1067 | /* | ||
1068 | * On iSeries we just parse the mem=X option from the command line. | ||
1069 | * On pSeries it's a bit more complicated, see prom_init_mem() | ||
1070 | */ | ||
1071 | static int __init early_parsemem(char *p) | ||
1072 | { | ||
1073 | if (p) | ||
1074 | cmd_mem_limit = ALIGN(memparse(p, &p), PAGE_SIZE); | ||
1075 | return 0; | ||
1076 | } | ||
1077 | early_param("mem", early_parsemem); | ||
1078 | |||
1079 | static void hvputc(char c) | 1057 | static void hvputc(char c) |
1080 | { | 1058 | { |
1081 | if (c == '\n') | 1059 | if (c == '\n') |