diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
| commit | 0a8c5395f90f06d128247844b2515c8bf3f2826b (patch) | |
| tree | d95382dcdfa303b99d480c01763d6cb6767fdaca /include/linux/linkage.h | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
[XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'include/linux/linkage.h')
| -rw-r--r-- | include/linux/linkage.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 9fd1f859021b..fee9e59649c1 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
| @@ -64,14 +64,6 @@ | |||
| 64 | name: | 64 | name: |
| 65 | #endif | 65 | #endif |
| 66 | 66 | ||
| 67 | #define KPROBE_ENTRY(name) \ | ||
| 68 | .pushsection .kprobes.text, "ax"; \ | ||
| 69 | ENTRY(name) | ||
| 70 | |||
| 71 | #define KPROBE_END(name) \ | ||
| 72 | END(name); \ | ||
| 73 | .popsection | ||
| 74 | |||
| 75 | #ifndef END | 67 | #ifndef END |
| 76 | #define END(name) \ | 68 | #define END(name) \ |
| 77 | .size name, .-name | 69 | .size name, .-name |