public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel

Browse source 
Pull hexagon updates from Richard Kuo:
 "Just two fixes -- one for a uapi header and one for a timer interface"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  Revert "Hexagon: fix signal.c compile error"
  hexagon/time: Migrate to new 'set-state' interface
This commit is contained in:
Linus Torvalds 2015-09-10 16:19:07 -07:00
commit 0cdf5a4640
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/hexagon/include/uapi/asm/signal.h
View file

@ -19,8 +19,6 @@
#ifndef _ASM_SIGNAL_H #ifndef _ASM_SIGNAL_H
#define _ASM_SIGNAL_H #define _ASM_SIGNAL_H
#include <uapi/asm/registers.h>
extern unsigned long __rt_sigtramp_template[2]; extern unsigned long __rt_sigtramp_template[2];
void do_signal(struct pt_regs *regs); void do_signal(struct pt_regs *regs);

17
arch/hexagon/kernel/time.c
View file

@ -97,20 +97,6 @@ static int set_next_event(unsigned long delta, struct clock_event_device *evt)
return 0; return 0;
} }
/*
* Sets the mode (periodic, shutdown, oneshot, etc) of a timer.
*/
static void set_mode(enum clock_event_mode mode,
struct clock_event_device *evt)
{
switch (mode) {
case CLOCK_EVT_MODE_SHUTDOWN:
/* XXX implement me */
default:
break;
}
}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Broadcast mechanism */ /* Broadcast mechanism */
static void broadcast(const struct cpumask *mask) static void broadcast(const struct cpumask *mask)
@ -119,13 +105,13 @@ static void broadcast(const struct cpumask *mask)
} }
#endif #endif
/* XXX Implement set_state_shutdown() */
static struct clock_event_device hexagon_clockevent_dev = { static struct clock_event_device hexagon_clockevent_dev = {
.name = "clockevent", .name = "clockevent",
.features = CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_ONESHOT,
.rating = 400, .rating = 400,
.irq = RTOS_TIMER_INT, .irq = RTOS_TIMER_INT,
.set_next_event = set_next_event, .set_next_event = set_next_event,
.set_mode = set_mode,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
.broadcast = broadcast, .broadcast = broadcast,
#endif #endif
@ -146,7 +132,6 @@ void setup_percpu_clockdev(void)
dummy_clock_dev->features = CLOCK_EVT_FEAT_DUMMY; dummy_clock_dev->features = CLOCK_EVT_FEAT_DUMMY;
dummy_clock_dev->cpumask = cpumask_of(cpu); dummy_clock_dev->cpumask = cpumask_of(cpu);
dummy_clock_dev->mode = CLOCK_EVT_MODE_UNUSED;
clockevents_register_device(dummy_clock_dev); clockevents_register_device(dummy_clock_dev);
} }