diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/memory.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index f80e0e331cb7..2f5f8a5ef2a0 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h | |||
| @@ -53,6 +53,13 @@ struct memory_notify { | |||
| 53 | struct notifier_block; | 53 | struct notifier_block; |
| 54 | struct mem_section; | 54 | struct mem_section; |
| 55 | 55 | ||
| 56 | /* | ||
| 57 | * Priorities for the hotplug memory callback routines (stored in decreasing | ||
| 58 | * order in the callback chain) | ||
| 59 | */ | ||
| 60 | #define SLAB_CALLBACK_PRI 1 | ||
| 61 | #define IPC_CALLBACK_PRI 10 | ||
| 62 | |||
| 56 | #ifndef CONFIG_MEMORY_HOTPLUG_SPARSE | 63 | #ifndef CONFIG_MEMORY_HOTPLUG_SPARSE |
| 57 | static inline int memory_dev_init(void) | 64 | static inline int memory_dev_init(void) |
| 58 | { | 65 | { |