diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 19:40:50 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 19:40:50 -0700 |
| commit | 688d794c4c3f8b08c814381ee2edd3ede5856056 (patch) | |
| tree | ef680add71e2a9588d07d8b594edbc1b5cd127d7 /include/linux/memory.h | |
| parent | USB: cdc-acm - blacklist IMS PCU device (diff) | |
| parent | Linux 3.9-rc3 (diff) | |
| download | linux-dev-688d794c4c3f8b08c814381ee2edd3ede5856056.tar.xz linux-dev-688d794c4c3f8b08c814381ee2edd3ede5856056.zip | |
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().
Diffstat (limited to 'include/linux/memory.h')
| -rw-r--r-- | include/linux/memory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h index ff9a9f8e0ed9..45e93b468878 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h @@ -53,6 +53,8 @@ int arch_get_memory_phys_device(unsigned long start_pfn); struct memory_notify { unsigned long start_pfn; unsigned long nr_pages; + int status_change_nid_normal; + int status_change_nid_high; int status_change_nid; }; |