diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /include/linux/bootmem.h | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'include/linux/bootmem.h')
| -rw-r--r-- | include/linux/bootmem.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 324fe08ea3b1..6d6795d46a75 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -91,6 +91,11 @@ extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat, | |||
| 91 | unsigned long size, | 91 | unsigned long size, |
| 92 | unsigned long align, | 92 | unsigned long align, |
| 93 | unsigned long goal); | 93 | unsigned long goal); |
| 94 | void *___alloc_bootmem_node_nopanic(pg_data_t *pgdat, | ||
| 95 | unsigned long size, | ||
| 96 | unsigned long align, | ||
| 97 | unsigned long goal, | ||
| 98 | unsigned long limit); | ||
| 94 | extern void *__alloc_bootmem_low(unsigned long size, | 99 | extern void *__alloc_bootmem_low(unsigned long size, |
| 95 | unsigned long align, | 100 | unsigned long align, |
| 96 | unsigned long goal); | 101 | unsigned long goal); |