Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207303
b: refs/heads/master
c: e446127
h: refs/heads/master
i:
  207301: 2eb7e37
  207299: 2c7083c
  207295: ad42920
v: v3
  • Loading branch information
Kevin Winchester authored and Linus Torvalds committed Aug 10, 2010
1 parent e8382c7 commit dd6f5f9
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 22c5c03b42c082ab57b5d24824769ada0d90f8dc
refs/heads/master: e446127134de06c4aceaa511f411d06eac91634b
4 changes: 2 additions & 2 deletions trunk/init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ core_param(initcall_debug, initcall_debug, bool, 0644);

static char msgbuf[64];

static int do_one_initcall_debug(initcall_t fn)
static int __init_or_module do_one_initcall_debug(initcall_t fn)
{
ktime_t calltime, delta, rettime;
unsigned long long duration;
Expand All @@ -739,7 +739,7 @@ static int do_one_initcall_debug(initcall_t fn)
return ret;
}

int do_one_initcall(initcall_t fn)
int __init_or_module do_one_initcall(initcall_t fn)
{
int count = preempt_count();
int ret;
Expand Down

0 comments on commit dd6f5f9

Please sign in to comment.