lkml.org 
[lkml]   [2012]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] time: remove the unnecessary CONFIG_GENERIC_CLOCKEVENS check
Date
In kernel/time/Kconfig:
config GENERIC_CLOCKEVENTS_BUILD
bool
default y
depends on GENERIC_CLOCKEVENTS

So there is no need to check CONFIG_GENERIC_CLOCKEVENTS if the
CONFIG_GENERIC_CLOCKEVENTS_BUILD is defined already.

This prepares for the total removal of GENERIC_CLOCKEVENTS_BUILD.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
include/linux/clockchips.h | 4 ----
kernel/time/clockevents.c | 2 --
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 81e803e..ac15057 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -155,11 +155,7 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
freq, minsec);
}

-#ifdef CONFIG_GENERIC_CLOCKEVENTS
extern void clockevents_notify(unsigned long reason, void *arg);
-#else
-# define clockevents_notify(reason, arg) do { } while (0)
-#endif

#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */

diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 1ecd6ba..f91b7a8 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -399,7 +399,6 @@ void clockevents_exchange_device(struct clock_event_device *old,
local_irq_restore(flags);
}

-#ifdef CONFIG_GENERIC_CLOCKEVENTS
/**
* clockevents_notify - notification about relevant events
*/
@@ -439,4 +438,3 @@ void clockevents_notify(unsigned long reason, void *arg)
raw_spin_unlock_irqrestore(&clockevents_lock, flags);
}
EXPORT_SYMBOL_GPL(clockevents_notify);
-#endif
--
1.7.1


\
 
 \ /
  Last update: 2012-01-05 06:15    [from the cache]
©2003-2011 Jasper Spaans