diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /arch/s390/mm/init.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index fa31de6ae97a..29f3a63806b9 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
| @@ -126,6 +126,9 @@ void __init mem_init(void) | |||
| 126 | /* clear the zero-page */ | 126 | /* clear the zero-page */ |
| 127 | memset(empty_zero_page, 0, PAGE_SIZE); | 127 | memset(empty_zero_page, 0, PAGE_SIZE); |
| 128 | 128 | ||
| 129 | /* Setup guest page hinting */ | ||
| 130 | cmma_init(); | ||
| 131 | |||
| 129 | /* this will put all low memory onto the freelists */ | 132 | /* this will put all low memory onto the freelists */ |
| 130 | totalram_pages += free_all_bootmem(); | 133 | totalram_pages += free_all_bootmem(); |
| 131 | 134 | ||