Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cdf5a46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 65c61bc5 02cc2ccf

arch/hexagon/include/uapi/asm/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#ifndef _ASM_SIGNAL_H

#define _ASM_SIGNAL_H



#include <uapi/asm/registers.h>



extern unsigned long __rt_sigtramp_template[2];



void do_signal(struct pt_regs *regs);

arch/hexagon/kernel/time.c

+1 −16
Original line number Diff line number Diff line
@@ -97,20 +97,6 @@ static int set_next_event(unsigned long delta, struct clock_event_device *evt) 
	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

/*  Broadcast mechanism  */

static void broadcast(const struct cpumask *mask)
@@ -119,13 +105,13 @@ static void broadcast(const struct cpumask *mask) 
}

#endif



/* XXX Implement set_state_shutdown() */

static struct clock_event_device hexagon_clockevent_dev = {

	.name		= "clockevent",

	.features	= CLOCK_EVT_FEAT_ONESHOT,

	.rating		= 400,

	.irq		= RTOS_TIMER_INT,

	.set_next_event = set_next_event,

	.set_mode	= set_mode,

#ifdef CONFIG_SMP

	.broadcast	= broadcast,

#endif
@@ -146,7 +132,6 @@ void setup_percpu_clockdev(void) 


	dummy_clock_dev->features = CLOCK_EVT_FEAT_DUMMY;

	dummy_clock_dev->cpumask = cpumask_of(cpu);

	dummy_clock_dev->mode = CLOCK_EVT_MODE_UNUSED;



	clockevents_register_device(dummy_clock_dev);

}