Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54525
b: refs/heads/master
c: 72280ed
h: refs/heads/master
i:
  54523: 79113d7
v: v3
  • Loading branch information
Yasunori Goto authored and Linus Torvalds committed May 8, 2007
1 parent e8a0ca5 commit f4b39f5
Show file tree
Hide file tree
Showing 4 changed files with 30 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: a3142c8e1dd57ff48040bdb3478cff9312543dc3
refs/heads/master: 72280ede316911fd5a82ef78d12a6705b1007d36
2 changes: 1 addition & 1 deletion trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ void __init setup_per_cpu_pageset(void)

#endif

static __meminit
static __meminit noinline
int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
{
int i;
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/sparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EXPORT_SYMBOL(page_to_nid);
#endif

#ifdef CONFIG_SPARSEMEM_EXTREME
static struct mem_section *sparse_index_alloc(int nid)
static struct mem_section noinline *sparse_index_alloc(int nid)
{
struct mem_section *section = NULL;
unsigned long array_size = SECTIONS_PER_ROOT *
Expand Down
27 changes: 27 additions & 0 deletions trunk/scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,16 @@ static int strrcmp(const char *s, const char *sub)
* tosec = .init.text
* fromsec = .paravirtprobe
*
* Pattern 9:
* Some of functions are common code between boot time and hotplug
* time. The bootmem allocater is called only boot time in its
* functions. So it's ok to reference.
* tosec = .init.text
*
* Pattern 10:
* ia64 has machvec table for each platform. It is mixture of function
* pointer of .init.text and .text.
* fromsec = .machvec
**/
static int secref_whitelist(const char *modname, const char *tosec,
const char *fromsec, const char *atsym,
Expand All @@ -668,6 +678,12 @@ static int secref_whitelist(const char *modname, const char *tosec,
NULL
};

const char *pat4sym[] = {
"sparse_index_alloc",
"zone_wait_table_init",
NULL
};

/* Check for pattern 1 */
if (strcmp(tosec, ".init.data") != 0)
f1 = 0;
Expand Down Expand Up @@ -726,6 +742,17 @@ static int secref_whitelist(const char *modname, const char *tosec,
(strcmp(fromsec, ".paravirtprobe") == 0))
return 1;

/* Check for pattern 9 */
if ((strcmp(tosec, ".init.text") == 0) &&
(strcmp(fromsec, ".text") == 0))
for (s = pat4sym; *s; s++)
if (strcmp(atsym, *s) == 0)
return 1;

/* Check for pattern 10 */
if (strcmp(fromsec, ".machvec") == 0)
return 1;

return 0;
}

Expand Down

0 comments on commit f4b39f5

Please sign in to comment.