---

yaml --- r: 307617 b: refs/heads/master c: dd48d70 h: refs/heads/master i: 307615: 1cb2d5a v: v3
git-mirror · May 21, 2012 · a4cbc11 · a4cbc11
1 parent 3bc3089
commit a4cbc11
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 764e0da14fd7ac2d259d98d34ece0a87d32306c9
+refs/heads/master: dd48d708ff3e917f6d6b6c2b696c3f18c019feed
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -1459,6 +1459,8 @@ endmenu
 
 menu "Kernel Features"
 
+source "kernel/time/Kconfig"
+
 config HAVE_SMP
 	bool
 	help

diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig
@@ -61,6 +61,8 @@ source "kernel/Kconfig.freezer"
 
 menu "System Type and features"
 
+source "kernel/time/Kconfig"
+
 config SUBARCH_AVR32B
 	bool
 config MMU

diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig
@@ -631,6 +631,8 @@ config GPTMR0_CLOCKSOURCE
 	depends on !TICKSOURCE_GPTMR0
 endmenu
 
+source kernel/time/Kconfig
+
 comment "Misc"
 
 choice

diff --git a/trunk/arch/c6x/Kconfig b/trunk/arch/c6x/Kconfig
@@ -132,6 +132,7 @@ source "mm/Kconfig"
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"
+source "kernel/time/Kconfig"
 
 endmenu
 

diff --git a/trunk/arch/h8300/Kconfig.cpu b/trunk/arch/h8300/Kconfig.cpu
@@ -1,5 +1,7 @@
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 choice
 	prompt "H8/300 platform"
 	default H8300H_GENERIC

diff --git a/trunk/arch/hexagon/Kconfig b/trunk/arch/hexagon/Kconfig
@@ -183,6 +183,7 @@ endchoice
 source "mm/Kconfig"
 
 source "kernel/Kconfig.hz"
+source "kernel/time/Kconfig"
 
 config GENERIC_GPIO
 	bool "Generic GPIO support"

diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
@@ -106,6 +106,10 @@ if COLDFIRE
 source "kernel/Kconfig.preempt"
 endif
 
+if !MMU || COLDFIRE
+source "kernel/time/Kconfig"
+endif
+
 source "mm/Kconfig"
 
 endmenu

diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig
@@ -74,6 +74,8 @@ source "arch/microblaze/platform/Kconfig.platform"
 
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"

diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -2205,6 +2205,8 @@ config NR_CPUS
 	  performance should round up your number of processors to the next
 	  power of two.
 
+source "kernel/time/Kconfig"
+
 #
 # Timer Interrupt Frequency Configuration
 #

diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig
@@ -226,6 +226,7 @@ config MN10300_USING_JTAG
 	  single-stepping, which are taken over completely by the JTAG unit.
 
 source "kernel/Kconfig.hz"
+source "kernel/time/Kconfig"
 
 config MN10300_RTC
 	bool "Using MN10300 RTC"

diff --git a/trunk/arch/openrisc/Kconfig b/trunk/arch/openrisc/Kconfig
@@ -106,6 +106,7 @@ config OPENRISC_HAVE_INST_DIV
 endmenu
 
 
+source "kernel/time/Kconfig"
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "mm/Kconfig"

diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -278,6 +278,7 @@ config HIGHMEM
 	bool "High memory support"
 	depends on PPC32
 
+source kernel/time/Kconfig
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"

diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -131,6 +131,8 @@ menu "Base setup"
 
 comment "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 config 64BIT
 	def_bool y
 	prompt "64 bit kernel"

diff --git a/trunk/arch/score/Kconfig b/trunk/arch/score/Kconfig
@@ -66,6 +66,7 @@ config MEMORY_START
 	hex
 	default	0xa0000000
 
+source "kernel/time/Kconfig"
 source "kernel/Kconfig.hz"
 source "kernel/Kconfig.preempt"
 

diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -577,6 +577,9 @@ config SH_CLK_CPG_LEGACY
 	depends on SH_CLK_CPG
 	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
 		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757
+
+source "kernel/time/Kconfig"
+
 endmenu
 
 menu "CPU Frequency scaling"

diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
@@ -266,6 +266,8 @@ config HOTPLUG_CPU
 	  can be controlled through /sys/devices/system/cpu/cpu#.
 	  Say N if you want to disable CPU hotplug.
 
+source "kernel/time/Kconfig"
+
 if SPARC64
 source "drivers/cpufreq/Kconfig"
 

diff --git a/trunk/arch/tile/Kconfig b/trunk/arch/tile/Kconfig
@@ -136,6 +136,8 @@ config NR_CPUS
 	  smaller kernel memory footprint results from using a smaller
 	  value on chips with fewer tiles.
 
+source "kernel/time/Kconfig"
+
 source "kernel/Kconfig.hz"
 
 config KEXEC

diff --git a/trunk/arch/um/Kconfig.um b/trunk/arch/um/Kconfig.um
@@ -10,6 +10,7 @@ config STATIC_LINK
 	  2.75G) for UML.
 
 source "mm/Kconfig"
+source "kernel/time/Kconfig"
 
 config LD_SCRIPT_STATIC
 	bool

diff --git a/trunk/arch/unicore32/Kconfig b/trunk/arch/unicore32/Kconfig
@@ -143,6 +143,8 @@ endmenu
 
 menu "Kernel Features"
 
+source "kernel/time/Kconfig"
+
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"

diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -241,6 +241,8 @@ config ZONE_DMA
 
 	  If unsure, say Y.
 
+source "kernel/time/Kconfig"
+
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---

diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
@@ -387,7 +387,6 @@ config AUDIT_LOGINUID_IMMUTABLE
 	  but may not be backwards compatible with older init systems.
 
 source "kernel/irq/Kconfig"
-source "kernel/time/Kconfig"
 
 menu "RCU Subsystem"
 

diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
@@ -2,6 +2,38 @@
 # Timer subsystem related configuration options
 #
 
+# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
+# only related to the tick functionality. Oneshot clockevent devices
+# are supported independ of this.
+config TICK_ONESHOT
+	bool
+
+config NO_HZ
+	bool "Tickless System (Dynamic Ticks)"
+	depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
+	select TICK_ONESHOT
+	help
+	  This option enables a tickless system: timer interrupts will
+	  only trigger on an as-needed basis both when the system is
+	  busy and when the system is idle.
+
+config HIGH_RES_TIMERS
+	bool "High Resolution Timer Support"
+	depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
+	select TICK_ONESHOT
+	help
+	  This option enables high resolution timer support. If your
+	  hardware is not capable then this option only increases
+	  the size of the kernel image.
+
+config GENERIC_CLOCKEVENTS_BUILD
+	bool
+	default y
+	depends on GENERIC_CLOCKEVENTS
+
+config GENERIC_CLOCKEVENTS_MIN_ADJUST
+	bool
+
 # Options selectable by arch Kconfig
 
 # Watchdog function for clocksources to detect instabilities
@@ -28,52 +60,11 @@ config ARCH_USES_GETTIMEOFFSET
 config GENERIC_CLOCKEVENTS
 	bool
 
-# Migration helper. Builds, but does not invoke
-config GENERIC_CLOCKEVENTS_BUILD
-	bool
-	default y
-	depends on GENERIC_CLOCKEVENTS
-
 # Clockevents broadcasting infrastructure
 config GENERIC_CLOCKEVENTS_BROADCAST
 	bool
 	depends on GENERIC_CLOCKEVENTS
 
-# Automatically adjust the min. reprogramming time for
-# clock event device
-config GENERIC_CLOCKEVENTS_MIN_ADJUST
-	bool
-
 # Generic update of CMOS clock
 config GENERIC_CMOS_UPDATE
 	bool
-
-if GENERIC_CLOCKEVENTS
-menu "Timers subsystem"
-
-# Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
-# only related to the tick functionality. Oneshot clockevent devices
-# are supported independ of this.
-config TICK_ONESHOT
-	bool
-
-config NO_HZ
-	bool "Tickless System (Dynamic Ticks)"
-	depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
-	select TICK_ONESHOT
-	help
-	  This option enables a tickless system: timer interrupts will
-	  only trigger on an as-needed basis both when the system is
-	  busy and when the system is idle.
-
-config HIGH_RES_TIMERS
-	bool "High Resolution Timer Support"
-	depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS
-	select TICK_ONESHOT
-	help
-	  This option enables high resolution timer support. If your
-	  hardware is not capable then this option only increases
-	  the size of the kernel image.
-
-endmenu
-endif
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -412,6 +412,7 @@ int second_overflow(unsigned long secs)
 		if (secs % 86400 == 0) {
 			leap = -1;
 			time_state = TIME_OOP;
+			time_tai++;
 			printk(KERN_NOTICE
 				"Clock: inserting leap second 23:59:60 UTC\n");
 		}
@@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
 		}
 		break;
 	case TIME_OOP:
-		time_tai++;
 		time_state = TIME_WAIT;
 		break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1459,6 +1459,8 @@ endmenu @@
     menu "Kernel Features"
+    source "kernel/time/Kconfig"
     config HAVE_SMP
     	bool
     	help
@@ Expand Down @@