diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /drivers/lguest/core.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/lguest/core.c')
| -rw-r--r-- | drivers/lguest/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 5eea4356d70..90663e01a56 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c | |||
| @@ -135,6 +135,7 @@ static void unmap_switcher(void) | |||
| 135 | /* Now we just need to free the pages we copied the switcher into */ | 135 | /* Now we just need to free the pages we copied the switcher into */ |
| 136 | for (i = 0; i < TOTAL_SWITCHER_PAGES; i++) | 136 | for (i = 0; i < TOTAL_SWITCHER_PAGES; i++) |
| 137 | __free_pages(switcher_page[i], 0); | 137 | __free_pages(switcher_page[i], 0); |
| 138 | kfree(switcher_page); | ||
| 138 | } | 139 | } |
| 139 | 140 | ||
| 140 | /*H:032 | 141 | /*H:032 |