History

locking: Move the mutex code to kernel/locking/

Peter Zijlstra committed 13 years ago

Commit 01768b41 parent c90423d6 files · +11 −4Browse files

Unified · Split

6 files
  1. kernel/Makefile +2 −4
  2. kernel/locking/Makefile +9 −0
  3. kernel/locking/mutex-debug.c +0 −0
  4. kernel/locking/mutex-debug.h +0 −0
  5. kernel/locking/mutex.c +0 −0
  6. kernel/locking/mutex.h +0 −0
kernel/Makefile+2−4
@@ -7,7 +7,7 @@ obj-y = fork.o exec_domain.o panic.o \ · 6 unmodified lines
7 sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \7 sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
8 signal.o sys.o kmod.o workqueue.o pid.o task_work.o \8 signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
9 extable.o params.o posix-timers.o \9 extable.o params.o posix-timers.o \
10 kthread.o sys_ni.o posix-cpu-timers.o mutex.o \10 kthread.o sys_ni.o posix-cpu-timers.o \
11 hrtimer.o rwsem.o nsproxy.o semaphore.o \11 hrtimer.o rwsem.o nsproxy.o semaphore.o \
12 notifier.o ksysfs.o cred.o reboot.o \12 notifier.o ksysfs.o cred.o reboot.o \
13 async.o range.o groups.o lglock.o smpboot.o13 async.o range.o groups.o lglock.o smpboot.o
@@ -16,13 +16,12 @@ ifdef CONFIG_FUNCTION_TRACER · 2 unmodified lines
16# Do not trace debug files and internal ftrace files16# Do not trace debug files and internal ftrace files
17CFLAGS_REMOVE_lockdep.o = -pg17CFLAGS_REMOVE_lockdep.o = -pg
18CFLAGS_REMOVE_lockdep_proc.o = -pg18CFLAGS_REMOVE_lockdep_proc.o = -pg
19CFLAGS_REMOVE_mutex-debug.o = -pg
20CFLAGS_REMOVE_rtmutex-debug.o = -pg
21CFLAGS_REMOVE_cgroup-debug.o = -pg19CFLAGS_REMOVE_cgroup-debug.o = -pg
22CFLAGS_REMOVE_irq_work.o = -pg20CFLAGS_REMOVE_irq_work.o = -pg
23endif21endif
24 22
25obj-y += sched/23obj-y += sched/
24obj-y += locking/
26obj-y += power/25obj-y += power/
27obj-y += printk/26obj-y += printk/
28obj-y += cpu/27obj-y += cpu/
@@ -34,7 +33,6 @@ obj-$(CONFIG_FREEZER) += freezer.o · 5 unmodified lines
34obj-$(CONFIG_PROFILING) += profile.o33obj-$(CONFIG_PROFILING) += profile.o
35obj-$(CONFIG_STACKTRACE) += stacktrace.o34obj-$(CONFIG_STACKTRACE) += stacktrace.o
36obj-y += time/35obj-y += time/
37obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
38obj-$(CONFIG_LOCKDEP) += lockdep.o36obj-$(CONFIG_LOCKDEP) += lockdep.o
39ifeq ($(CONFIG_PROC_FS),y)37ifeq ($(CONFIG_PROC_FS),y)
40obj-$(CONFIG_LOCKDEP) += lockdep_proc.o38obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
kernel/locking/Makefile+9−0
@@ -0,0 +1,9 @@
1
2obj-y += mutex.o
3
4ifdef CONFIG_FUNCTION_TRACER
5CFLAGS_REMOVE_mutex-debug.o = -pg
6CFLAGS_REMOVE_rtmutex-debug.o = -pg
7endif
8
9obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
kernel/locking/mutex-debug.crenamed from kernel/mutex-debug.c+0−0

File renamed without changes.

kernel/locking/mutex-debug.hrenamed from kernel/mutex-debug.h+0−0

File renamed without changes.

kernel/locking/mutex.crenamed from kernel/mutex.c+0−0

File renamed without changes.

kernel/locking/mutex.hrenamed from kernel/mutex.h+0−0

File renamed without changes.