| Submitter | David Miller |
|---|---|
| Date | May 12, 2012, 4:04 a.m. |
| Message ID | <20120512.000435.555735991523298219.davem@davemloft.net> |
| Download | mbox | patch |
| Permalink | /patch/158680/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
Patch
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index b7a543c..1b87ea0 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -125,20 +125,11 @@ floppy_tdone: set sparc_cpu_model, %l5 ld [%l5], %l5 - subcc %l5, 1, %g0 /* enum { sun4c = 1 }; */ - be 1f - ldub [%l7], %l5 + ldub [%l7], %l5 or %l5, 0xc2, %l5 stb %l5, [%l7] andn %l5, 0x02, %l5 - b 2f - nop - -1: - or %l5, 0xf4, %l5 - stb %l5, [%l7] - andn %l5, 0x04, %l5 2: /* Kill some time so the bits set */
There were two blocks of code for the two ways to twiddle the terminal count pin in the AUXIO register, one for sun4c and one for sun4m. Kill the former. Signed-off-by: David S. Miller <davem@davemloft.net> --- arch/sparc/kernel/entry.S | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)