[Demudi-commits] r970 - in linux-patch-realtime-preempt/trunk: . debian

[Free Ekanayaka]

Author: free-guest
Date: 2006-10-25 13:54:57 +0000 (Wed, 25 Oct 2006)
New Revision: 970

Modified:
   linux-patch-realtime-preempt/trunk/debian/changelog
   linux-patch-realtime-preempt/trunk/patch-2.6.18-rt7
Log:
releasing version 2.6.18+rt7-2

Modified: linux-patch-realtime-preempt/trunk/debian/changelog
===================================================================
--- linux-patch-realtime-preempt/trunk/debian/changelog	2006-10-25 12:28:31 UTC (rev 969)
+++ linux-patch-realtime-preempt/trunk/debian/changelog	2006-10-25 13:54:57 UTC (rev 970)
@@ -1,3 +1,10 @@
+linux-patch-realtime-preempt (2.6.18+rt7-2) unstable; urgency=low
+
+  * Removed time.c patch for sparc64, as it conflicts with Debian
+    specific patches
+
+ -- Free Ekanayaka <free at 64studio.com>  Wed, 25 Oct 2006 14:55:30 +0200
+
 linux-patch-realtime-preempt (2.6.18+rt7-1) unstable; urgency=low
 
   * Patch patch-2.6.18-rt7

Modified: linux-patch-realtime-preempt/trunk/patch-2.6.18-rt7
===================================================================
--- linux-patch-realtime-preempt/trunk/patch-2.6.18-rt7	2006-10-25 12:28:31 UTC (rev 969)
+++ linux-patch-realtime-preempt/trunk/patch-2.6.18-rt7	2006-10-25 13:54:57 UTC (rev 970)
@@ -10528,118 +10528,6 @@
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_SPARC64_PAGE_SIZE_8KB=y
  # CONFIG_SPARC64_PAGE_SIZE_64KB is not set
-Index: linux/arch/sparc64/kernel/time.c
-===================================================================
---- linux.orig/arch/sparc64/kernel/time.c
-+++ linux/arch/sparc64/kernel/time.c
-@@ -31,6 +31,7 @@
- #include <linux/profile.h>
- #include <linux/miscdevice.h>
- #include <linux/rtc.h>
-+#include <linux/clocksource.h>
- 
- #include <asm/oplib.h>
- #include <asm/mostek.h>
-@@ -53,8 +54,6 @@ void __iomem *mstk48t02_regs = NULL;
- unsigned long ds1287_regs = 0UL;
- #endif
- 
--extern unsigned long wall_jiffies;
--
- static void __iomem *mstk48t08_regs;
- static void __iomem *mstk48t59_regs;
- 
-@@ -465,7 +464,7 @@ irqreturn_t timer_interrupt(int irq, voi
- 		profile_tick(CPU_PROFILING, regs);
- 		update_process_times(user_mode(regs));
- #endif
--		do_timer(regs);
-+		do_timer(1);
- 
- 		/* Guarantee that the following sequences execute
- 		 * uninterrupted.
-@@ -496,7 +495,7 @@ void timer_tick_interrupt(struct pt_regs
- {
- 	write_seqlock(&xtime_lock);
- 
--	do_timer(regs);
-+	do_timer(1);
- 
- 	timer_check_rtc();
- 
-@@ -621,7 +620,7 @@ static void __init set_system_time(void)
- 	if (!mregs && !dregs) {
- 		prom_printf("Something wrong, clock regs not mapped yet.\n");
- 		prom_halt();
--	}		
-+	}
- 
- 	if (mregs) {
- 		spin_lock_irq(&mostek_lock);
-@@ -821,7 +820,7 @@ static int __devinit clock_probe(struct 
- 	}
- 
- 	set_system_time();
--	
-+
- 	local_irq_restore(flags);
- 
- 	return 0;
-@@ -976,22 +975,33 @@ static struct notifier_block sparc64_cpu
- 
- #endif /* CONFIG_CPU_FREQ */
- 
--static struct time_interpolator sparc64_cpu_interpolator = {
--	.source		=	TIME_SOURCE_CPU,
--	.shift		=	16,
--	.mask		=	0xffffffffffffffffLL
-+static cycle_t read_itc(void)
-+{
-+        return (cycle_t)get_cycles());
-+}
-+
-+static struct clocksource clocksource_sparc64_itc = {
-+        .name           = "sparc64_itc",
-+        .rating         = 300,
-+        .read           = read_itc,
-+        .mask           = 0xffffffffffffffffLL,
-+        .mult           = 0, /*to be caluclated*/
-+        .shift          = 16,
-+        .is_continuous  = 1,
- };
- 
-+
- /* The quotient formula is taken from the IA64 port. */
- #define SPARC64_NSEC_PER_CYC_SHIFT	30UL
- void __init time_init(void)
- {
- 	unsigned long clock = sparc64_init_timers();
- 
--	sparc64_cpu_interpolator.frequency = clock;
--	register_time_interpolator(&sparc64_cpu_interpolator);
-+	clocksource_sparc64_itc.mult = clocksource_hz2mult(clock,
-+						clocksource_sparc64_itc.shift);
-+	clocksource_register(&clocksource_sparc64_itc);
- 
--	/* Now that the interpolator is registered, it is
-+	/* Now that the clocksource is registered, it is
- 	 * safe to start the timer ticking.
- 	 */
- 	sparc64_start_timers();
-@@ -1026,11 +1036,11 @@ static int set_rtc_mmss(unsigned long no
- 	unsigned long flags;
- 	u8 tmp;
- 
--	/* 
-+	/*
- 	 * Not having a register set can lead to trouble.
- 	 * Also starfire doesn't have a tod clock.
- 	 */
--	if (!mregs && !dregs) 
-+	if (!mregs && !dregs)
- 		return -1;
- 
- 	if (mregs) {
 Index: linux/arch/um/kernel/time.c
 ===================================================================
 --- linux.orig/arch/um/kernel/time.c