diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /arch/ia64/kernel/entry.S | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff) | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff) | |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.
Conflicts:
drivers/base/power/clock_ops.c
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 97dd2abdeb1a..198c753d1006 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1614,7 +1614,7 @@ sys_call_table: | |||
| 1614 | data8 sys_sched_get_priority_min | 1614 | data8 sys_sched_get_priority_min |
| 1615 | data8 sys_sched_rr_get_interval | 1615 | data8 sys_sched_rr_get_interval |
| 1616 | data8 sys_nanosleep | 1616 | data8 sys_nanosleep |
| 1617 | data8 sys_nfsservctl | 1617 | data8 sys_ni_syscall // old nfsservctl |
| 1618 | data8 sys_prctl // 1170 | 1618 | data8 sys_prctl // 1170 |
| 1619 | data8 sys_getpagesize | 1619 | data8 sys_getpagesize |
| 1620 | data8 sys_mmap2 | 1620 | data8 sys_mmap2 |