diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-20 02:23:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-20 02:23:53 -0400 |
| commit | bdcddf95e82b1c4e370fc1196b1f4f50f775dab4 (patch) | |
| tree | ef2af2b3faee1f8e8287ca45d265809f56fbd0f6 /tools/lib/lockdep/uinclude/linux/kernel.h | |
| parent | 91d9f9856f91c82ac6289a0fff65dd12cfa07e34 (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
Backmerge v4.1-rc4 into into drm-next
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Diffstat (limited to 'tools/lib/lockdep/uinclude/linux/kernel.h')
| -rw-r--r-- | tools/lib/lockdep/uinclude/linux/kernel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h index a11e3c357be7..cd2cc59a5da7 100644 --- a/tools/lib/lockdep/uinclude/linux/kernel.h +++ b/tools/lib/lockdep/uinclude/linux/kernel.h | |||
| @@ -28,6 +28,9 @@ | |||
| 28 | #define __init | 28 | #define __init |
| 29 | #define noinline | 29 | #define noinline |
| 30 | #define list_add_tail_rcu list_add_tail | 30 | #define list_add_tail_rcu list_add_tail |
| 31 | #define list_for_each_entry_rcu list_for_each_entry | ||
| 32 | #define barrier() | ||
| 33 | #define synchronize_sched() | ||
| 31 | 34 | ||
| 32 | #ifndef CALLER_ADDR0 | 35 | #ifndef CALLER_ADDR0 |
| 33 | #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) | 36 | #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) |