diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-19 16:03:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-19 16:03:48 +1000 |
| commit | f96f64a2b154ef09e2baf818006517634dc047a8 (patch) | |
| tree | 649bc5df5740629cd4f8fb377aa5ccf1f6168d6d /scripts | |
| parent | 18d8a6f0e1cbc994ba76fa66bdb47bebcb2e0ac6 (diff) | |
| parent | 9f7cbb8e78439df050091777c5a56cbb96e7a424 (diff) | |
Merge commit 'tip/auto-latest'
Conflicts:
arch/x86/include/asm/socket.h
include/linux/rcupdate.h
kernel/fork.c
kernel/irq/manage.c
kernel/trace/trace.h
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 911ba7ffab84..090d300d7394 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -57,7 +57,6 @@ # call mcount (offset: 0x5) # [...] # ret -# .globl my_func # other_func: # [...] # call mcount (offset: 0x1b) |