mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-04 08:16:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
37cce26b32142f09a8967f6d238178af654b20de
linux/kernel
History
H Hartley Sweeten 37cce26b32 PM / VT: Cleanup #if defined uglyness and fix compile error 
Introduce the config option CONFIG_VT_CONSOLE_SLEEP in order to cleanup
the #if defined ugliness for the vt suspend support functions. Note that
CONFIG_VT_CONSOLE is already dependant on CONFIG_VT.

The function pm_set_vt_switch is actually dependant on CONFIG_VT and not
CONFIG_PM_SLEEP. This fixes a compile error when CONFIG_PM_SLEEP is
not set:

drivers/tty/vt/vt_ioctl.c:1794: error: redefinition of 'pm_set_vt_switch'
include/linux/suspend.h:17: error: previous definition of 'pm_set_vt_switch' was here

Also, remove the incorrect path from the comment in console.c.

[rjw: Replaced #if defined() with #ifdef in suspend.h.]

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-10-16 23:28:51 +02:00
..
debug
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
2011-08-01 13:39:40 -10:00
events
perf_event: Fix broken calc_timer_values()
2011-08-31 15:56:29 +02:00
gcov
gcov: disable CONSTRUCTORS for UML
2011-07-26 16:49:45 -07:00
irq
irq: Fix check for already initialized irq_domain in irq_domain_add
2011-09-20 12:16:22 +02:00
power
PM / VT: Cleanup #if defined uglyness and fix compile error
2011-10-16 23:28:51 +02:00
time
alarmtimers: Avoid possible denial of service with high freq periodic timers
2011-08-10 10:26:09 -07:00
trace
Merge branch 'pm-runtime' into pm-for-linus
2011-10-07 23:16:55 +02:00
.gitignore
…
acct.c
pass a struct path to vfs_statfs
2010-08-09 16:48:42 -04:00
async.c
async: Fixed an include coding style issue
2011-06-14 22:48:46 -04:00
audit_tree.c
audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
2011-07-20 14:10:11 -07:00
audit_watch.c
kill path_lookup()
2011-03-14 09:15:23 -04:00
audit.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
audit.h
audit: make functions static
2010-10-30 01:42:19 -04:00
auditfilter.c
netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms
2011-03-03 10:55:40 -08:00
auditsc.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
backtracetest.c
…
bounds.c
memcg: remove direct page_cgroup-to-page pointer
2011-03-23 19:46:28 -07:00
capability.c
Merge branch 'master' into next
2011-05-19 18:51:57 +10:00
cgroup_freezer.c
cgroups: add per-thread subsystem callbacks
2011-05-26 17:12:34 -07:00
cgroup.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
2011-07-27 19:26:38 -07:00
compat.c
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-30 00:08:53 -07:00
configs.c
kernel/configs.c: include MODULE_*() when CONFIG_IKCONFIG_PROC=n
2011-07-25 20:57:15 -07:00
cpu.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
cpuset.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
crash_dump.c
crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn
2011-03-23 19:47:19 -07:00
cred.c
move RLIMIT_NPROC check from set_user() to do_execve_common()
2011-08-11 11:24:42 -07:00
delayacct.c
KVM: Steal time implementation
2011-07-14 12:59:14 +03:00
dma.c
…
elfcore.c
elf coredump: add extended numbering support
2010-03-06 11:26:46 -08:00
exec_domain.c
sys_personality: remove the bogus checks in sys_personality()->__set_personality() path
2010-08-09 20:45:05 -07:00
exit.c
ipc: introduce shm_rmid_forced sysctl
2011-07-26 16:49:44 -07:00
extable.c
extable, core_kernel_data(): Make sure all archs define _sdata
2011-05-20 08:56:56 +02:00
fork.c
move RLIMIT_NPROC check from set_user() to do_execve_common()
2011-08-11 11:24:42 -07:00
freezer.c
Freezer: Use SMP barriers
2011-05-17 23:19:17 +02:00
futex_compat.c
userns: user namespaces: convert several capable() calls
2011-03-23 19:47:08 -07:00
futex.c
Merge branch 'linus' into core/urgent
2011-08-04 09:09:27 +02:00
groups.c
userns: user namespaces: convert several capable() calls
2011-03-23 19:47:08 -07:00
hrtimer.c
hrtimers: Fix typo causing erratic timers
2011-05-25 15:31:58 -07:00
hung_task.c
watchdog, hung_task_timeout: Add Kconfig configurable default
2011-04-28 09:13:17 +02:00
irq_work.c
irq_work: Use per cpu atomics instead of regular atomics
2010-12-18 15:54:48 +01:00
itimer.c
itimers: Fix racy writes to cpu_itimer fields
2009-11-18 16:32:12 +01:00
jump_label.c
jump_label: Fix jump_label update for modules
2011-06-29 09:59:17 -04:00
kallsyms.c
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-03-25 17:52:22 -07:00
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.locks
arch:Kconfig.locks Remove unused config option.
2011-04-10 17:01:05 +02:00
Kconfig.preempt
sched: Isolate preempt counting in its own config option
2011-06-10 15:15:40 +02:00
kexec.c
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
kfifo.c
kfifo: fix scatterlist usage
2010-10-01 10:50:58 -07:00
kmod.c
Boot up with usermodehelper disabled
2011-08-03 22:03:29 -10:00
kprobes.c
kprobes: Return -ENOENT if probe point doesn't exist
2011-07-15 15:11:47 -04:00
ksysfs.c
kernel/ksysfs.c: expose file_caps_enabled in sysfs
2011-04-19 16:45:51 -07:00
kthread.c
cpuset: Fix cpuset_cpus_allowed_fallback(), don't update tsk->rt.nr_cpus_allowed
2011-05-28 17:02:57 +02:00
latencytop.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
lockdep_internals.h
lockdep: No need to disable preemption in debug atomic ops
2010-05-04 05:38:16 +02:00
lockdep_proc.c
lockdep: Remove unused 'factor' variable from lockdep_stats_show()
2011-03-23 13:54:47 +01:00
lockdep_states.h
…
lockdep.c
lockdep: Fix wrong assumption in match_held_lock
2011-08-09 11:57:35 +02:00
Makefile
PM QoS: Move and rename the implementation files
2011-08-25 15:35:03 +02:00
module.c
module: add /sys/module/<name>/uevent files
2011-07-24 22:06:04 +09:30
mutex-debug.c
mutex: Use p->on_cpu for the adaptive spin
2011-04-14 08:52:33 +02:00
mutex-debug.h
mutex: Use p->on_cpu for the adaptive spin
2011-04-14 08:52:33 +02:00
mutex.c
lockdep, mutex: provide mutex_lock_nest_lock
2011-05-25 08:39:17 -07:00
mutex.h
mutex: Use p->on_cpu for the adaptive spin
2011-04-14 08:52:33 +02:00
notifier.c
notifiers: sys: move reboot notifiers into reboot.h
2011-07-25 20:57:14 -07:00
nsproxy.c
make sure that nsproxy_cache is initialized early enough
2011-07-20 01:44:07 -04:00
padata.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
panic.c
panic: panic=-1 for immediate reboot
2011-07-26 16:49:45 -07:00
params.c
module: add /sys/module/<name>/uevent files
2011-07-24 22:06:04 +09:30
pid_namespace.c
pidns: call pid_ns_prepare_proc() from create_pid_namespace()
2011-03-23 19:46:58 -07:00
pid.c
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
2011-07-08 22:21:58 +02:00
posix-cpu-timers.c
posix-cpu-timers: Cure SMP wobbles
2011-09-30 14:07:06 +02:00
posix-timers.c
posix-timers: RCU conversion
2011-05-24 12:10:51 +02:00
printk.c
kernel/printk: do not turn off bootconsole in printk_late_init() if keep_bootcon
2011-08-25 16:25:34 -07:00
profile.c
kernel/profile.c: remove some duplicate code from profile_hits()
2011-05-26 17:12:37 -07:00
ptrace.c
ptrace: PTRACE_LISTEN forgets to unlock ->siglock
2011-09-25 11:02:00 -07:00
range.c
kernel/range.c: fix clean_sort_range() for the case of full array
2010-11-12 07:55:31 -08:00
rcupdate.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
rcutiny_plugin.h
rcu: Converge TINY_RCU expedited and normal boosting
2011-05-05 23:16:58 -07:00
rcutiny.c
sanitize <linux/prefetch.h> usage
2011-05-20 12:50:29 -07:00
rcutorture.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
rcutree_plugin.h
softirq,rcu: Inform RCU of irq_exit() activity
2011-07-20 10:50:12 -07:00
rcutree_trace.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
rcutree.c
rcu: Prevent RCU callbacks from executing before scheduler initialized
2011-07-13 08:17:56 -07:00
rcutree.h
rcu: Move RCU_BOOST #ifdefs to header file
2011-06-16 16:12:05 -07:00
relay.c
Clean up relay_alloc_page_array() slightly by using vzalloc rather than vmalloc and memset
2010-11-05 08:21:34 -07:00
res_counter.c
memcg: res_counter_read_u64(): fix potential races on 32-bit machines
2011-03-23 19:46:22 -07:00
resource.c
Resource: fix wrong resource window calculation
2011-09-29 20:04:34 -07:00
rtmutex_common.h
rtmutex: Simplify PI algorithm and make highest prio task get lock
2011-01-27 21:13:51 -05:00
rtmutex-debug.c
rtmutex: Simplify PI algorithm and make highest prio task get lock
2011-01-27 21:13:51 -05:00
rtmutex-debug.h
…
rtmutex-tester.c
rtmutex: tester: Remove the remaining BKL leftovers
2011-02-22 22:07:22 +01:00
rtmutex.c
plist: Remove the need to supply locks to plist heads
2011-07-08 14:02:53 +02:00
rtmutex.h
…
rwsem.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
sched_autogroup.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
sched_autogroup.h
sched: Skip autogroup when looking for all rt sched groups
2011-07-01 10:39:08 +02:00
sched_clock.c
sched: Add some clock info to sched_debug
2010-11-23 10:29:08 +01:00
sched_cpupri.c
sched: No need for bootmem special cases
2010-07-17 12:06:22 +02:00
sched_cpupri.h
sched: No need for bootmem special cases
2010-07-17 12:06:22 +02:00
sched_debug.c
sched: Get rid of lock_depth
2011-04-24 13:18:38 +02:00
sched_fair.c
sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
2011-07-22 12:47:22 +02:00
sched_features.h
Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2011-07-24 09:07:03 -07:00
sched_idletask.c
sched: Drop the rq argument to sched_class::select_task_rq()
2011-04-14 08:52:36 +02:00
sched_rt.c
sched/rt: Migrate equal priority tasks to available CPUs
2011-09-18 13:48:56 +02:00
sched_stats.h
sched: More sched_domain iterations fixes
2011-05-28 17:02:54 +02:00
sched_stoptask.c
sched: Drop the rq argument to sched_class::select_task_rq()
2011-04-14 08:52:36 +02:00
sched.c
posix-cpu-timers: Cure SMP wobbles
2011-09-30 14:07:06 +02:00
seccomp.c
…
semaphore.c
…
signal.c
signals: sys_ssetmask/sys_rt_sigsuspend should use set_current_blocked()
2011-07-27 12:53:36 -07:00
smp.c
generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts
2011-06-17 10:17:12 +02:00
softirq.c
softirq,rcu: Inform RCU of irq_exit() activity
2011-07-20 10:50:12 -07:00
spinlock.c
locking: Cleanup the name space completely
2009-12-14 23:55:33 +01:00
srcu.c
rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status
2011-01-14 04:56:49 -08:00
stacktrace.c
stack_trace: Add weak save_stack_trace_regs()
2011-06-14 22:48:52 -04:00
stop_machine.c
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
sys_ni.c
All Arch: remove linkage for sys_nfsservctl system call
2011-08-26 15:09:58 -07:00
sys.c
Add a personality to report 2.6.x version numbers
2011-08-25 10:17:28 -07:00
sysctl_binary.c
xfs: remove subdirectories
2011-08-12 16:21:35 -05:00
sysctl_check.c
xfs: remove subdirectories
2011-08-12 16:21:35 -05:00
sysctl.c
sysctl,rcu: Convert call_rcu(free_head) to kfree
2011-07-20 14:10:18 -07:00
taskstats.c
Make TASKSTATS require root access
2011-09-19 17:04:37 -07:00
test_kprobes.c
kprobes: Fix selftest to clear flags field for reusing probes
2010-10-14 08:55:27 +02:00
time.c
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-03-15 18:53:35 -07:00
timeconst.pl
…
timer.c
timers: Consider slack value in mod_timer()
2011-06-03 15:02:32 +02:00
tracepoint.c
jump label: Introduce static_branch() interface
2011-04-04 12:48:08 -04:00
tsacct.c
Make taskstats round statistics down to nearest 1k bytes/events
2011-09-19 17:10:57 -07:00
uid16.c
userns: user namespaces: convert several capable() calls
2011-03-23 19:47:08 -07:00
up.c
…
user_namespace.c
user_ns: improve the user_ns on-the-slab packaging
2011-01-13 08:03:18 -08:00
user-return-notifier.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
user.c
userns: add a user_namespace as creator/owner of uts_namespace
2011-03-23 19:46:59 -07:00
utsname_sysctl.c
sysctl kernel: Remove binary sysctl logic
2009-11-12 02:04:55 -08:00
utsname.c
ns proc: Add support for the uts namespace
2011-05-10 14:35:35 -07:00
wait.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
watchdog.c
perf, x86: P4 PMU - Introduce event alias feature
2011-07-14 17:25:04 -04:00
workqueue_sched.h
workqueue: implement concurrency managed dynamic worker pool
2010-06-29 10:07:14 +02:00
workqueue.c
workqueue: lock cwq access in drain_workqueue
2011-09-14 18:09:38 -07:00