Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295276
b: refs/heads/master
c: b908243
h: refs/heads/master
v: v3
  • Loading branch information
Djalal Harouni authored and Linus Torvalds committed Mar 23, 2012
1 parent 3630481 commit d91f48e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: accb61fe7bb0f5c2a4102239e4981650f9048519
refs/heads/master: b908243c549448fc0662f9cdd8d5cfe620fcdc31
6 changes: 4 additions & 2 deletions trunk/fs/proc/kcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ static int kcore_update_ram(void)

#ifdef CONFIG_SPARSEMEM_VMEMMAP
/* calculate vmemmap's address from given system ram pfn and register it */
int get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
static int
get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
{
unsigned long pfn = __pa(ent->addr) >> PAGE_SHIFT;
unsigned long nr_pages = ent->size >> PAGE_SHIFT;
Expand Down Expand Up @@ -189,7 +190,8 @@ int get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)

}
#else
int get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
static int
get_sparsemem_vmemmap_info(struct kcore_list *ent, struct list_head *head)
{
return 1;
}
Expand Down

0 comments on commit d91f48e

Please sign in to comment.