From: Chris Wright Date: Thu, 24 May 2007 23:10:49 +0000 (-0700) Subject: remove iop-fix-iop_getttimeoffset.patch from queue-2.6.20 (doesn't apply, X-Git-Tag: v2.6.20.13~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02510b018385f6bfe9d7d838406c192aa80eb4db;p=thirdparty%2Fkernel%2Fstable-queue.git remove iop-fix-iop_getttimeoffset.patch from queue-2.6.20 (doesn't apply, author didn't reply to request for refresh for 2.6.20). --- diff --git a/queue-2.6.20/iop-fix-iop_getttimeoffset.patch b/queue-2.6.20/iop-fix-iop_getttimeoffset.patch deleted file mode 100644 index ab10f5da919..00000000000 --- a/queue-2.6.20/iop-fix-iop_getttimeoffset.patch +++ /dev/null @@ -1,53 +0,0 @@ -From stable-bounces@linux.kernel.org Wed May 2 11:45:45 2007 -From: Dan Williams -To: stable@kernel.org -Date: Wed, 02 May 2007 11:43:14 -0700 -Message-ID: <20070502184314.10289.8158.stgit@dwillia2-linux.ch.intel.com> -Cc: rmk@arm.linux.org.uk -Subject: [stable] [PATCH 1/2] iop: fix iop_getttimeoffset - -Fix a typo which causes a necessary cpwait to be missed on iop3xx, Michael -Brunner - -Save a register in the assembly routine, rmk - -Cc: Lennert Buytenhek -Cc: Russell King -Signed-off-by: Dan Williams -Signed-off-by: Chris Wright ---- - - arch/arm/plat-iop/time.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c -index 16300ad..0cc26da 100644 ---- a/arch/arm/plat-iop/time.c -+++ b/arch/arm/plat-iop/time.c -@@ -32,22 +32,22 @@ static unsigned long next_jiffy_time; - - unsigned long iop_gettimeoffset(void) - { -- unsigned long offset, temp1, temp2; -+ unsigned long offset, temp; - - /* enable cp6, if necessary, to avoid taking the overhead of an - * undefined instruction trap - */ - asm volatile ( - "mrc p15, 0, %0, c15, c1, 0\n\t" -- "ands %1, %0, #(1 << 6)\n\t" -+ "tst %0, #(1 << 6)\n\t" - "orreq %0, %0, #(1 << 6)\n\t" - "mcreq p15, 0, %0, c15, c1, 0\n\t" --#ifdef CONFIG_XSCALE -+#ifdef CONFIG_CPU_XSCALE - "mrceq p15, 0, %0, c15, c1, 0\n\t" - "moveq %0, %0\n\t" - "subeq pc, pc, #4\n\t" - #endif -- : "=r"(temp1), "=r"(temp2) : : "cc"); -+ : "=r"(temp) : : "cc"); - - offset = next_jiffy_time - read_tcr1(); - diff --git a/queue-2.6.20/series b/queue-2.6.20/series index 7830fa31dab..0ecdf150608 100644 --- a/queue-2.6.20/series +++ b/queue-2.6.20/series @@ -10,4 +10,3 @@ jfs-fix-race-waking-up-jfsio-kernel-thread.patch crypto-api-read-module-pointer-before-freeing-algorithm.patch fuse-fix-mknod-of-regular-file.patch acpi-thermal-fix-mod_timer-interval.patch -iop-fix-iop_getttimeoffset.patch