Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner: - The final conversion of timer wheel timers to timer_setup(). A few manual conversions and a large coccinelle assisted sweep and the removal of the old initialization mechanisms and the related code. - Remove the now unused VSYSCALL update code - Fix permissions of /proc/timer_list. I still need to get rid of that file completely - Rename a misnomed clocksource function and remove a stale declaration * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits) m68k/macboing: Fix missed timer callback assignment treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts timer: Remove redundant __setup_timer*() macros timer: Pass function down to initialization routines timer: Remove unused data arguments from macros timer: Switch callback prototype to take struct timer_list * argument timer: Pass timer_list pointer to callbacks unconditionally Coccinelle: Remove setup_timer.cocci timer: Remove setup_*timer() interface timer: Remove init_timer() interface treewide: setup_timer() -> timer_setup() (2 field) treewide: setup_timer() -> timer_setup() treewide: init_timer() -> setup_timer() treewide: Switch DEFINE_TIMER callbacks to struct timer_list * s390: cmm: Convert timers to use timer_setup() lightnvm: Convert timers to use timer_setup() drivers/net: cris: Convert timers to use timer_setup() drm/vc4: Convert timers to use timer_setup() block/laptop_mode: Convert timers to use timer_setup() net/atm/mpc: Avoid open-coded assignment of timer callback function ...
No related branches found
No related tags found
Showing
- Documentation/core-api/local_ops.rst 3 additions, 7 deletionsDocumentation/core-api/local_ops.rst
- arch/alpha/kernel/srmcons.c 3 additions, 4 deletionsarch/alpha/kernel/srmcons.c
- arch/arm/mach-iop32x/n2100.c 2 additions, 3 deletionsarch/arm/mach-iop32x/n2100.c
- arch/arm/mach-ixp4xx/dsmg600-setup.c 2 additions, 2 deletionsarch/arm/mach-ixp4xx/dsmg600-setup.c
- arch/arm/mach-ixp4xx/nas100d-setup.c 2 additions, 2 deletionsarch/arm/mach-ixp4xx/nas100d-setup.c
- arch/arm/mach-orion5x/db88f5281-setup.c 2 additions, 2 deletionsarch/arm/mach-orion5x/db88f5281-setup.c
- arch/blackfin/kernel/nmi.c 2 additions, 3 deletionsarch/blackfin/kernel/nmi.c
- arch/m68k/amiga/amisound.c 2 additions, 2 deletionsarch/m68k/amiga/amisound.c
- arch/m68k/mac/macboing.c 4 additions, 4 deletionsarch/m68k/mac/macboing.c
- arch/mips/lasat/picvue_proc.c 2 additions, 2 deletionsarch/mips/lasat/picvue_proc.c
- arch/mips/mti-malta/malta-display.c 2 additions, 2 deletionsarch/mips/mti-malta/malta-display.c
- arch/parisc/kernel/pdc_cons.c 2 additions, 2 deletionsarch/parisc/kernel/pdc_cons.c
- arch/powerpc/kernel/tau_6xx.c 2 additions, 2 deletionsarch/powerpc/kernel/tau_6xx.c
- arch/powerpc/kvm/booke.c 3 additions, 4 deletionsarch/powerpc/kvm/booke.c
- arch/powerpc/oprofile/op_model_cell.c 4 additions, 4 deletionsarch/powerpc/oprofile/op_model_cell.c
- arch/powerpc/platforms/cell/spufs/sched.c 4 additions, 4 deletionsarch/powerpc/platforms/cell/spufs/sched.c
- arch/powerpc/platforms/powermac/low_i2c.c 3 additions, 3 deletionsarch/powerpc/platforms/powermac/low_i2c.c
- arch/s390/kernel/time.c 2 additions, 2 deletionsarch/s390/kernel/time.c
- arch/s390/mm/cmm.c 3 additions, 5 deletionsarch/s390/mm/cmm.c
- arch/sh/drivers/heartbeat.c 3 additions, 3 deletionsarch/sh/drivers/heartbeat.c
Loading
Please register or sign in to comment