git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
base
/
memory.c
diff --git
a/drivers/base/memory.c
b/drivers/base/memory.c
index
c6b7d9c
..
105a0d6
100644
(file)
--- a/
drivers/base/memory.c
+++ b/
drivers/base/memory.c
@@
-47,16
+47,16
@@
static struct kset_uevent_ops memory_uevent_ops = {
.uevent = memory_uevent,
};
.uevent = memory_uevent,
};
-static
BLOCKING_NOTIFIER_HEAD(memory_chain)
;
+static
struct notifier_block *memory_chain
;
int register_memory_notifier(struct notifier_block *nb)
{
int register_memory_notifier(struct notifier_block *nb)
{
- return
blocking_
notifier_chain_register(&memory_chain, nb);
+ return notifier_chain_register(&memory_chain, nb);
}
void unregister_memory_notifier(struct notifier_block *nb)
{
}
void unregister_memory_notifier(struct notifier_block *nb)
{
-
blocking_
notifier_chain_unregister(&memory_chain, nb);
+ notifier_chain_unregister(&memory_chain, nb);
}
/*
}
/*
@@
-140,7
+140,7
@@
static ssize_t show_mem_state(struct sys_device *dev, char *buf)
static inline int memory_notify(unsigned long val, void *v)
{
static inline int memory_notify(unsigned long val, void *v)
{
- return
blocking_
notifier_call_chain(&memory_chain, val, v);
+ return notifier_call_chain(&memory_chain, val, v);
}
/*
}
/*
@@
-306,13
+306,11
@@
static ssize_t
memory_probe_store(struct class *class, const char *buf, size_t count)
{
u64 phys_addr;
memory_probe_store(struct class *class, const char *buf, size_t count)
{
u64 phys_addr;
- int nid;
int ret;
phys_addr = simple_strtoull(buf, NULL, 0);
int ret;
phys_addr = simple_strtoull(buf, NULL, 0);
- nid = memory_add_physaddr_to_nid(phys_addr);
- ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT);
+ ret = add_memory(phys_addr, PAGES_PER_SECTION << PAGE_SHIFT);
if (ret)
count = ret;
if (ret)
count = ret;