diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
| commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
| tree | 734289dc85074903d9e636a935d43414746e222c /mm/hugetlb.c | |
| parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9b9aeef8e590..f8feeeca6686 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -1761,7 +1761,7 @@ static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp) | |||
| 1761 | * Unregister hstate attributes from a single node device. | 1761 | * Unregister hstate attributes from a single node device. |
| 1762 | * No-op if no hstate attributes attached. | 1762 | * No-op if no hstate attributes attached. |
| 1763 | */ | 1763 | */ |
| 1764 | void hugetlb_unregister_node(struct node *node) | 1764 | static void hugetlb_unregister_node(struct node *node) |
| 1765 | { | 1765 | { |
| 1766 | struct hstate *h; | 1766 | struct hstate *h; |
| 1767 | struct node_hstate *nhs = &node_hstates[node->dev.id]; | 1767 | struct node_hstate *nhs = &node_hstates[node->dev.id]; |
| @@ -1805,7 +1805,7 @@ static void hugetlb_unregister_all_nodes(void) | |||
| 1805 | * Register hstate attributes for a single node device. | 1805 | * Register hstate attributes for a single node device. |
| 1806 | * No-op if attributes already registered. | 1806 | * No-op if attributes already registered. |
| 1807 | */ | 1807 | */ |
| 1808 | void hugetlb_register_node(struct node *node) | 1808 | static void hugetlb_register_node(struct node *node) |
| 1809 | { | 1809 | { |
| 1810 | struct hstate *h; | 1810 | struct hstate *h; |
| 1811 | struct node_hstate *nhs = &node_hstates[node->dev.id]; | 1811 | struct node_hstate *nhs = &node_hstates[node->dev.id]; |