Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16823
b: refs/heads/master
c: b792de3
h: refs/heads/master
i:
  16821: a8bec90
  16819: 0b8ccc9
  16815: f6cf0c2
v: v3
  • Loading branch information
Olaf Hering authored and Linus Torvalds committed Jan 9, 2006
1 parent ea3def0 commit d55dfaa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4dab06fa7b6d07ee95c8bba5ddd0840633069159
refs/heads/master: b792de39d892e06b18ddea85be076bae123d6bf6
8 changes: 1 addition & 7 deletions trunk/include/linux/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,15 @@ static inline void unregister_memory_notifier(struct notifier_block *nb)
{
}
#else
extern int register_memory(struct memory_block *, struct mem_section *section, struct node *);
extern int register_new_memory(struct mem_section *);
extern int unregister_memory_section(struct mem_section *);
extern int memory_dev_init(void);
extern int register_memory_notifier(struct notifier_block *nb);
extern void unregister_memory_notifier(struct notifier_block *nb);
extern int remove_memory_block(unsigned long, struct mem_section *, int);

#define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT)

extern int invalidate_phys_mapping(unsigned long, unsigned long);
struct notifier_block;

extern int register_memory_notifier(struct notifier_block *nb);
extern void unregister_memory_notifier(struct notifier_block *nb);

#endif /* CONFIG_MEMORY_HOTPLUG */

#define hotplug_memory_notifier(fn, pri) { \
Expand Down

0 comments on commit d55dfaa

Please sign in to comment.