summaryrefslogtreecommitdiffstats
path: root/include/linux/memory.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
commit91c030b4d6445ebe9fbddb86d584441f300df15c (patch)
treee8a48e3ad9e0448c690268175e555fa651983546 /include/linux/memory.h
parent7c3456fdb503071787f7f972de1069b9cacd16f0 (diff)
parentae6be51ed01d6c4aaf249a207b4434bc7785853b (diff)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/linux/memory.h')
-rw-r--r--include/linux/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 1adfe779eb9..85582e1bcee 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -36,6 +36,8 @@ struct memory_block {
struct sys_device sysdev;
};
+int arch_get_memory_phys_device(unsigned long start_pfn);
+
/* These states are exposed to userspace as text strings in sysfs */
#define MEM_ONLINE (1<<0) /* exposed to userspace */
#define MEM_GOING_OFFLINE (1<<1) /* exposed to userspace */