diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-07 04:14:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-07 04:14:45 +0100 |
| commit | 3cc5a2ee7fc8f67abeb91f39fd553b5d2d55b775 (patch) | |
| tree | 4e76d36de36583fa0880d3a6a536344b4c8d4b29 /arch/arm/include/asm/sched_clock.h | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
| parent | 6404f0b71c44cfd612ddf28627de31b4604d1d6e (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull arm fixes from Russell King:
"Not much here again.
The two most notable things here are the sched_clock() fix, which was
causing problems with the scheduling of threaded IRQs after a suspend
event, and the vfp fix, which afaik has only been seen on some older
OMAP boards. Nevertheless, both are fairly important fixes."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7569/1: mm: uninitialized warning corrections
ARM: 7567/1: io: avoid GCC's offsettable addressing modes for halfword accesses
ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set
ARM: 7565/1: sched: stop sched_clock() during suspend
Diffstat (limited to 'arch/arm/include/asm/sched_clock.h')
| -rw-r--r-- | arch/arm/include/asm/sched_clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h index 05b8e82ec9f..e3f75726343 100644 --- a/arch/arm/include/asm/sched_clock.h +++ b/arch/arm/include/asm/sched_clock.h @@ -10,7 +10,5 @@ extern void sched_clock_postinit(void); extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); -extern void setup_sched_clock_needs_suspend(u32 (*read)(void), int bits, - unsigned long rate); #endif |