History

Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson: - Fix missing prototype warnings in various places, including switching to using generic cmpdi2/ucmpdi2 and parport.h and stop selecting unneeded GENERIC_ISA_DMA. - Reduce duplicate code by using shared font data, with dependency fixup in separate commit touching lib/fonts. - Convert sbus drives to use remove callbacks returning void - Fix return values of __setup handlers - Section mismatch fix for grpci pci drivers - Make the vio bus type constant - Kconfig cleanups and fixes - Typo fixes * tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc: lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console sbus: uctrl: Convert to platform remove callback returning void sbus: flash: Convert to platform remove callback returning void sbus: envctrl: Convert to platform remove callback returning void sbus: display7seg: Convert to platform remove callback returning void sbus: bbc_i2c: Convert to platform remove callback returning void sbus: Add prototype for bbc_envctrl_init and bbc_envctrl_cleanup to header sparc32: Fix section mismatch in leon_pci_grpci sparc32: Fix parport build with sparc32 sparc32: Do not select GENERIC_ISA_DMA mtd: maps: sun_uflash: Declare uflash_devinit static sparc32: Fix build with trapbase sparc32: Use generic cmpdi2/ucmpdi2 variants sparc: select FRAME_POINTER instead of redefining it sparc: vDSO: fix return value of __setup handler sparc64: NMI watchdog: fix return value of __setup handler sparc: vio: make vio_bus_type const sparc: Fix typos sparc: Use shared font data sparc: remove obsolete config ARCH_ATU

Linus Torvalds committed 2 years ago

Commit 8a2fbff2 parents 54f42d2 84b76d045 files · +344 −744Browse files

Unified · Split

45 files
  1. arch/sparc/Kconfig +4 −8
  2. arch/sparc/Kconfig.debug +2 −5
  3. arch/sparc/include/asm/hypervisor.h +3 −3
  4. arch/sparc/include/asm/ldc.h +1 −1
  5. arch/sparc/include/asm/mmu_context_64.h +2 −2
  6. arch/sparc/include/asm/parport.h +7 −252
  7. arch/sparc/include/asm/parport_64.h +256 −0
  8. arch/sparc/include/asm/switch_to_64.h +1 −1
  9. arch/sparc/kernel/btext.c +9 −356
  10. arch/sparc/kernel/irq_32.c +3 −3
  11. arch/sparc/kernel/irq_64.c +1 −1
  12. arch/sparc/kernel/kernel.h +4 −4
  13. arch/sparc/kernel/kgdb_32.c +2 −2
  14. arch/sparc/kernel/kprobes.c +1 −1
  15. arch/sparc/kernel/ldc.c +1 −1
  16. arch/sparc/kernel/leon_pci_grpci1.c +1 −1
  17. arch/sparc/kernel/leon_pci_grpci2.c +2 −2
  18. arch/sparc/kernel/leon_smp.c +3 −3
  19. arch/sparc/kernel/nmi.c +1 −1
  20. arch/sparc/kernel/of_device_64.c +1 −1
  21. arch/sparc/kernel/pci.c +1 −1
  22. arch/sparc/kernel/pci_impl.h +2 −2
  23. arch/sparc/kernel/pci_schizo.c +2 −2
  24. arch/sparc/kernel/perf_event.c +1 −1
  25. arch/sparc/kernel/prom_irqtrans.c +1 −1
  26. arch/sparc/kernel/psycho_common.c +1 −1
  27. arch/sparc/kernel/setup_32.c +2 −2
  28. arch/sparc/kernel/signal_32.c +1 −1
  29. arch/sparc/kernel/signal_64.c +1 −1
  30. arch/sparc/kernel/vio.c +1 −1
  31. arch/sparc/lib/Makefile +2 −2
  32. arch/sparc/lib/cmpdi2.c +0 −28
  33. arch/sparc/lib/ucmpdi2.c +0 −20
  34. arch/sparc/mm/srmmu.c +1 −1
  35. arch/sparc/mm/tsb.c +1 −1
  36. arch/sparc/net/bpf_jit_comp_32.c +3 −3
  37. arch/sparc/vdso/vma.c +3 −4
  38. drivers/mtd/maps/sun_uflash.c +1 −1
  39. drivers/sbus/char/bbc_i2c.c +2 −7
  40. drivers/sbus/char/bbc_i2c.h +3 −0
  41. drivers/sbus/char/display7seg.c +2 −4
  42. drivers/sbus/char/envctrl.c +2 −4
  43. drivers/sbus/char/flash.c +2 −4
  44. drivers/sbus/char/uctrl.c +2 −3
  45. lib/fonts/Kconfig +2 −1
arch/sparc/Kconfig+4−8
@@ -58,6 +58,8 @@ config SPARC32 · 57 unmodified lines
5858 select CLZ_TAB
5959 select DMA_DIRECT_REMAP
6060 select GENERIC_ATOMIC64
61+ select GENERIC_LIB_CMPDI2
62+ select GENERIC_LIB_UCMPDI2
6163 select HAVE_UID16
6264 select HAVE_PAGE_SIZE_4KB
6365 select LOCK_MM_AND_FIND_VMA
@@ -115,10 +117,6 @@ config ARCH_PROC_KCORE_TEXT · 51 unmodified lines
115117 config CPU_BIG_ENDIAN
116118 def_bool y
117119
118−config ARCH_ATU
119− bool
120− default y if SPARC64
121−
122120 config STACKTRACE_SUPPORT
123121 bool
124122 default y if SPARC64
@@ -143,10 +141,6 @@ config HIGHMEM · 18 unmodified lines
143141 default y if SPARC32
144142 select KMAP_LOCAL
145143
146−config GENERIC_ISA_DMA
147− bool
148− default y if SPARC32
149−
150144 config PGTABLE_LEVELS
151145 default 4 if 64BIT
152146 default 3
@@ -222,6 +216,8 @@ config EARLYFB · 69 unmodified lines
222216 bool "Support for early boot text console"
223217 default y
224218 depends on SPARC64
219+ select FONT_SUN8x16
220+ select FONT_SUPPORT
225221 help
226222 Say Y here to enable a faster early framebuffer boot console.
227223
arch/sparc/Kconfig.debug+2−5
@@ -8,11 +8,8 @@ config MCOUNT · 7 unmodified lines
88 bool
99 depends on SPARC64
1010 depends on FUNCTION_TRACER
11− default y
12−
13−config FRAME_POINTER
14− bool
15− depends on MCOUNT
11+ select ARCH_WANT_FRAME_POINTERS
12+ select FRAME_POINTER
1613 default y
1714
1815 config HAVE_HARDLOCKUP_DETECTOR_SPARC64
arch/sparc/include/asm/hypervisor.h+3−3
@@ -430,7 +430,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count, · 429 unmodified lines
430430 * ERRORS: No errors defined.
431431 *
432432 * Return the hypervisor ID handle for the current CPU. Use by a
433− * virtual CPU to discover it's own identity.
433+ * virtual CPU to discover its own identity.
434434 */
435435 #define HV_FAST_CPU_MYID 0x16
436436
@@ -1221,7 +1221,7 @@ unsigned long sun4v_con_write(unsigned long buffer, · 784 unmodified lines
12211221 * EBADALIGNED software state description is not correctly
12221222 * aligned
12231223 *
1224− * This allows the guest to report it's soft state to the hypervisor. There
1224+ * This allows the guest to report its soft state to the hypervisor. There
12251225 * are two primary components to this state. The first part states whether
12261226 * the guest software is running or not. The second containts optional
12271227 * details specific to the software.
@@ -1502,7 +1502,7 @@ struct hv_trap_trace_entry { · 274 unmodified lines
15021502 * configuration error of some sort.
15031503 *
15041504 * The dump services provide an opaque buffer into which the
1505− * hypervisor can place it's internal state in order to assist in
1505+ * hypervisor can place its internal state in order to assist in
15061506 * debugging such situations. The contents are opaque and extremely
15071507 * platform and hypervisor implementation specific. The guest, during
15081508 * a core dump, requests that the hypervisor update any information in
arch/sparc/include/asm/ldc.h+1−1
@@ -13,7 +13,7 @@ void ldom_power_off(void); · 12 unmodified lines
1313 * or data becomes available on the receive side.
1414 *
1515 * For non-RAW links, if the LDC_EVENT_RESET event arrives the
16− * driver should reset all of it's internal state and reinvoke
16+ * driver should reset all of its internal state and reinvoke
1717 * ldc_connect() to try and bring the link up again.
1818 *
1919 * For RAW links, ldc_connect() is not used. Instead the driver
arch/sparc/include/asm/mmu_context_64.h+2−2
@@ -93,7 +93,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str · 92 unmodified lines
9393
9494 /* We have to be extremely careful here or else we will miss
9595 * a TSB grow if we switch back and forth between a kernel
96− * thread and an address space which has it's TSB size increased
96+ * thread and an address space which has its TSB size increased
9797 * on another processor.
9898 *
9999 * It is possible to play some games in order to optimize the
@@ -118,7 +118,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str · 18 unmodified lines
118118 *
119119 * At that point cpu0 continues to use a stale TSB, the one from
120120 * before the TSB grow performed on cpu1. cpu1 did not cross-call
121− * cpu0 to update it's TSB because at that point the cpu_vm_mask
121+ * cpu0 to update its TSB because at that point the cpu_vm_mask
122122 * only had cpu1 set in it.
123123 */
124124 tsb_context_switch_ctx(mm, CTX_HWBITS(mm->context));
arch/sparc/include/asm/parport.h+7−252
@@ -1,256 +1,11 @@
11 /* SPDX-License-Identifier: GPL-2.0 */
2−/* parport.h: sparc64 specific parport initialization and dma.
3− *
4− * Copyright (C) 1999 Eddie C. Dost (ecd@skynet.be)
5− */
2+#ifndef ___ASM_SPARC_PARPORT_H
3+#define ___ASM_SPARC_PARPORT_H
64
7−#ifndef _ASM_SPARC64_PARPORT_H
8−#define _ASM_SPARC64_PARPORT_H 1
9−
10−#include <linux/of.h>
11−#include <linux/platform_device.h>
12−
13−#include <asm/ebus_dma.h>
14−#include <asm/ns87303.h>
15−#include <asm/prom.h>
16−
17−#define PARPORT_PC_MAX_PORTS PARPORT_MAX
18−
19−/*
20− * While sparc64 doesn't have an ISA DMA API, we provide something that looks
21− * close enough to make parport_pc happy
22− */
23−#define HAS_DMA
24−
25−#ifdef CONFIG_PARPORT_PC_FIFO
26−static DEFINE_SPINLOCK(dma_spin_lock);
27−
28−#define claim_dma_lock() \
29−({ unsigned long flags; \
30− spin_lock_irqsave(&dma_spin_lock, flags); \
31− flags; \
32−})
33−
34−#define release_dma_lock(__flags) \
35− spin_unlock_irqrestore(&dma_spin_lock, __flags);
5+#if defined(__sparc__) && defined(__arch64__)
6+#include <asm/parport_64.h>
7+#else
8+#include <asm-generic/parport.h>
9+#endif
3610 #endif
3711
38−static struct sparc_ebus_info {
39− struct ebus_dma_info info;
40− unsigned int addr;
41− unsigned int count;
42− int lock;
43−
44− struct parport *port;
45−} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
46−
47−static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS);
48−
49−static inline int request_dma(unsigned int dmanr, const char *device_id)
50−{
51− if (dmanr >= PARPORT_PC_MAX_PORTS)
52− return -EINVAL;
53− if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
54− return -EBUSY;
55− return 0;
56−}
57−
58−static inline void free_dma(unsigned int dmanr)
59−{
60− if (dmanr >= PARPORT_PC_MAX_PORTS) {
61− printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
62− return;
63− }
64− if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
65− printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
66− return;
67− }
68−}
69−
70−static inline void enable_dma(unsigned int dmanr)
71−{
72− ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
73−
74− if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
75− sparc_ebus_dmas[dmanr].addr,
76− sparc_ebus_dmas[dmanr].count))
77− BUG();
78−}
79−
80−static inline void disable_dma(unsigned int dmanr)
81−{
82− ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 0);
83−}
84−
85−static inline void clear_dma_ff(unsigned int dmanr)
86−{
87− /* nothing */
88−}
89−
90−static inline void set_dma_mode(unsigned int dmanr, char mode)
91−{
92− ebus_dma_prepare(&sparc_ebus_dmas[dmanr].info, (mode != DMA_MODE_WRITE));
93−}
94−
95−static inline void set_dma_addr(unsigned int dmanr, unsigned int addr)
96−{
97− sparc_ebus_dmas[dmanr].addr = addr;
98−}
99−
100−static inline void set_dma_count(unsigned int dmanr, unsigned int count)
101−{
102− sparc_ebus_dmas[dmanr].count = count;
103−}
104−
105−static inline unsigned int get_dma_residue(unsigned int dmanr)
106−{
107− return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
108−}
109−
110−static int ecpp_probe(struct platform_device *op)
111−{
112− unsigned long base = op->resource[0].start;
113− unsigned long config = op->resource[1].start;
114− unsigned long d_base = op->resource[2].start;
115− unsigned long d_len;
116− struct device_node *parent;
117− struct parport *p;
118− int slot, err;
119−
120− parent = op->dev.of_node->parent;
121− if (of_node_name_eq(parent, "dma")) {
122− p = parport_pc_probe_port(base, base + 0x400,
123− op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
124− op->dev.parent->parent, 0);
125− if (!p)
126− return -ENOMEM;
127− dev_set_drvdata(&op->dev, p);
128− return 0;
129− }
130−
131− for (slot = 0; slot < PARPORT_PC_MAX_PORTS; slot++) {
132− if (!test_and_set_bit(slot, dma_slot_map))
133− break;
134− }
135− err = -ENODEV;
136− if (slot >= PARPORT_PC_MAX_PORTS)
137− goto out_err;
138−
139− spin_lock_init(&sparc_ebus_dmas[slot].info.lock);
140−
141− d_len = (op->resource[2].end - d_base) + 1UL;
142− sparc_ebus_dmas[slot].info.regs =
143− of_ioremap(&op->resource[2], 0, d_len, "ECPP DMA");
144−
145− if (!sparc_ebus_dmas[slot].info.regs)
146− goto out_clear_map;
147−
148− sparc_ebus_dmas[slot].info.flags = 0;
149− sparc_ebus_dmas[slot].info.callback = NULL;
150− sparc_ebus_dmas[slot].info.client_cookie = NULL;
151− sparc_ebus_dmas[slot].info.irq = 0xdeadbeef;
152− strcpy(sparc_ebus_dmas[slot].info.name, "parport");
153− if (ebus_dma_register(&sparc_ebus_dmas[slot].info))
154− goto out_unmap_regs;
155−
156− ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 1);
157−
158− /* Configure IRQ to Push Pull, Level Low */
159− /* Enable ECP, set bit 2 of the CTR first */
160− outb(0x04, base + 0x02);
161− ns87303_modify(config, PCR,
162− PCR_EPP_ENABLE |
163− PCR_IRQ_ODRAIN,
164− PCR_ECP_ENABLE |
165− PCR_ECP_CLK_ENA |
166− PCR_IRQ_POLAR);
167−
168− /* CTR bit 5 controls direction of port */
169− ns87303_modify(config, PTR,
170− 0, PTR_LPT_REG_DIR);
171−
172− p = parport_pc_probe_port(base, base + 0x400,
173− op->archdata.irqs[0],
174− slot,
175− op->dev.parent,
176− 0);
177− err = -ENOMEM;
178− if (!p)
179− goto out_disable_irq;
180−
181− dev_set_drvdata(&op->dev, p);
182−
183− return 0;
184−
185−out_disable_irq:
186− ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
187− ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
188−
189−out_unmap_regs:
190− of_iounmap(&op->resource[2], sparc_ebus_dmas[slot].info.regs, d_len);
191−
192−out_clear_map:
193− clear_bit(slot, dma_slot_map);
194−
195−out_err:
196− return err;
197−}
198−
199−static int ecpp_remove(struct platform_device *op)
200−{
201− struct parport *p = dev_get_drvdata(&op->dev);
202− int slot = p->dma;
203−
204− parport_pc_unregister_port(p);
205−
206− if (slot != PARPORT_DMA_NOFIFO) {
207− unsigned long d_base = op->resource[2].start;
208− unsigned long d_len;
209−
210− d_len = (op->resource[2].end - d_base) + 1UL;
211−
212− ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
213− ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
214− of_iounmap(&op->resource[2],
215− sparc_ebus_dmas[slot].info.regs,
216− d_len);
217− clear_bit(slot, dma_slot_map);
218− }
219−
220− return 0;
221−}
222−
223−static const struct of_device_id ecpp_match[] = {
224− {
225− .name = "ecpp",
226− },
227− {
228− .name = "parallel",
229− .compatible = "ecpp",
230− },
231− {
232− .name = "parallel",
233− .compatible = "ns87317-ecpp",
234− },
235− {
236− .name = "parallel",
237− .compatible = "pnpALI,1533,3",
238− },
239− {},
240−};
241−
242−static struct platform_driver ecpp_driver = {
243− .driver = {
244− .name = "ecpp",
245− .of_match_table = ecpp_match,
246− },
247− .probe = ecpp_probe,
248− .remove = ecpp_remove,
249−};
250−
251−static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
252−{
253− return platform_driver_register(&ecpp_driver);
254−}
255−
256−#endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/include/asm/parport_64.h+256−0
@@ -0,0 +1,256 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+/* parport.h: sparc64 specific parport initialization and dma.
3+ *
4+ * Copyright (C) 1999 Eddie C. Dost (ecd@skynet.be)
5+ */
6+
7+#ifndef _ASM_SPARC64_PARPORT_H
8+#define _ASM_SPARC64_PARPORT_H 1
9+
10+#include <linux/of.h>
11+#include <linux/platform_device.h>
12+
13+#include <asm/ebus_dma.h>
14+#include <asm/ns87303.h>
15+#include <asm/prom.h>
16+
17+#define PARPORT_PC_MAX_PORTS PARPORT_MAX
18+
19+/*
20+ * While sparc64 doesn't have an ISA DMA API, we provide something that looks
21+ * close enough to make parport_pc happy
22+ */
23+#define HAS_DMA
24+
25+#ifdef CONFIG_PARPORT_PC_FIFO
26+static DEFINE_SPINLOCK(dma_spin_lock);
27+
28+#define claim_dma_lock() \
29+({ unsigned long flags; \
30+ spin_lock_irqsave(&dma_spin_lock, flags); \
31+ flags; \
32+})
33+
34+#define release_dma_lock(__flags) \
35+ spin_unlock_irqrestore(&dma_spin_lock, __flags);
36+#endif
37+
38+static struct sparc_ebus_info {
39+ struct ebus_dma_info info;
40+ unsigned int addr;
41+ unsigned int count;
42+ int lock;
43+
44+ struct parport *port;
45+} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
46+
47+static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS);
48+
49+static inline int request_dma(unsigned int dmanr, const char *device_id)
50+{
51+ if (dmanr >= PARPORT_PC_MAX_PORTS)
52+ return -EINVAL;
53+ if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
54+ return -EBUSY;
55+ return 0;
56+}
57+
58+static inline void free_dma(unsigned int dmanr)
59+{
60+ if (dmanr >= PARPORT_PC_MAX_PORTS) {
61+ printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
62+ return;
63+ }
64+ if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
65+ printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
66+ return;
67+ }
68+}
69+
70+static inline void enable_dma(unsigned int dmanr)
71+{
72+ ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
73+
74+ if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
75+ sparc_ebus_dmas[dmanr].addr,
76+ sparc_ebus_dmas[dmanr].count))
77+ BUG();
78+}
79+
80+static inline void disable_dma(unsigned int dmanr)
81+{
82+ ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 0);
83+}
84+
85+static inline void clear_dma_ff(unsigned int dmanr)
86+{
87+ /* nothing */
88+}
89+
90+static inline void set_dma_mode(unsigned int dmanr, char mode)
91+{
92+ ebus_dma_prepare(&sparc_ebus_dmas[dmanr].info, (mode != DMA_MODE_WRITE));
93+}
94+
95+static inline void set_dma_addr(unsigned int dmanr, unsigned int addr)
96+{
97+ sparc_ebus_dmas[dmanr].addr = addr;
98+}
99+
100+static inline void set_dma_count(unsigned int dmanr, unsigned int count)
101+{
102+ sparc_ebus_dmas[dmanr].count = count;
103+}
104+
105+static inline unsigned int get_dma_residue(unsigned int dmanr)
106+{
107+ return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
108+}
109+
110+static int ecpp_probe(struct platform_device *op)
111+{
112+ unsigned long base = op->resource[0].start;
113+ unsigned long config = op->resource[1].start;
114+ unsigned long d_base = op->resource[2].start;
115+ unsigned long d_len;
116+ struct device_node *parent;
117+ struct parport *p;
118+ int slot, err;
119+
120+ parent = op->dev.of_node->parent;
121+ if (of_node_name_eq(parent, "dma")) {
122+ p = parport_pc_probe_port(base, base + 0x400,
123+ op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
124+ op->dev.parent->parent, 0);
125+ if (!p)
126+ return -ENOMEM;
127+ dev_set_drvdata(&op->dev, p);
128+ return 0;
129+ }
130+
131+ for (slot = 0; slot < PARPORT_PC_MAX_PORTS; slot++) {
132+ if (!test_and_set_bit(slot, dma_slot_map))
133+ break;
134+ }
135+ err = -ENODEV;
136+ if (slot >= PARPORT_PC_MAX_PORTS)
137+ goto out_err;
138+
139+ spin_lock_init(&sparc_ebus_dmas[slot].info.lock);
140+
141+ d_len = (op->resource[2].end - d_base) + 1UL;
142+ sparc_ebus_dmas[slot].info.regs =
143+ of_ioremap(&op->resource[2], 0, d_len, "ECPP DMA");
144+
145+ if (!sparc_ebus_dmas[slot].info.regs)
146+ goto out_clear_map;
147+
148+ sparc_ebus_dmas[slot].info.flags = 0;
149+ sparc_ebus_dmas[slot].info.callback = NULL;
150+ sparc_ebus_dmas[slot].info.client_cookie = NULL;
151+ sparc_ebus_dmas[slot].info.irq = 0xdeadbeef;
152+ strcpy(sparc_ebus_dmas[slot].info.name, "parport");
153+ if (ebus_dma_register(&sparc_ebus_dmas[slot].info))
154+ goto out_unmap_regs;
155+
156+ ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 1);
157+
158+ /* Configure IRQ to Push Pull, Level Low */
159+ /* Enable ECP, set bit 2 of the CTR first */
160+ outb(0x04, base + 0x02);
161+ ns87303_modify(config, PCR,
162+ PCR_EPP_ENABLE |
163+ PCR_IRQ_ODRAIN,
164+ PCR_ECP_ENABLE |
165+ PCR_ECP_CLK_ENA |
166+ PCR_IRQ_POLAR);
167+
168+ /* CTR bit 5 controls direction of port */
169+ ns87303_modify(config, PTR,
170+ 0, PTR_LPT_REG_DIR);
171+
172+ p = parport_pc_probe_port(base, base + 0x400,
173+ op->archdata.irqs[0],
174+ slot,
175+ op->dev.parent,
176+ 0);
177+ err = -ENOMEM;
178+ if (!p)
179+ goto out_disable_irq;
180+
181+ dev_set_drvdata(&op->dev, p);
182+
183+ return 0;
184+
185+out_disable_irq:
186+ ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
187+ ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
188+
189+out_unmap_regs:
190+ of_iounmap(&op->resource[2], sparc_ebus_dmas[slot].info.regs, d_len);
191+
192+out_clear_map:
193+ clear_bit(slot, dma_slot_map);
194+
195+out_err:
196+ return err;
197+}
198+
199+static int ecpp_remove(struct platform_device *op)
200+{
201+ struct parport *p = dev_get_drvdata(&op->dev);
202+ int slot = p->dma;
203+
204+ parport_pc_unregister_port(p);
205+
206+ if (slot != PARPORT_DMA_NOFIFO) {
207+ unsigned long d_base = op->resource[2].start;
208+ unsigned long d_len;
209+
210+ d_len = (op->resource[2].end - d_base) + 1UL;
211+
212+ ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
213+ ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
214+ of_iounmap(&op->resource[2],
215+ sparc_ebus_dmas[slot].info.regs,
216+ d_len);
217+ clear_bit(slot, dma_slot_map);
218+ }
219+
220+ return 0;
221+}
222+
223+static const struct of_device_id ecpp_match[] = {
224+ {
225+ .name = "ecpp",
226+ },
227+ {
228+ .name = "parallel",
229+ .compatible = "ecpp",
230+ },
231+ {
232+ .name = "parallel",
233+ .compatible = "ns87317-ecpp",
234+ },
235+ {
236+ .name = "parallel",
237+ .compatible = "pnpALI,1533,3",
238+ },
239+ {},
240+};
241+
242+static struct platform_driver ecpp_driver = {
243+ .driver = {
244+ .name = "ecpp",
245+ .of_match_table = ecpp_match,
246+ },
247+ .probe = ecpp_probe,
248+ .remove = ecpp_remove,
249+};
250+
251+static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
252+{
253+ return platform_driver_register(&ecpp_driver);
254+}
255+
256+#endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/include/asm/switch_to_64.h+1−1
@@ -15,7 +15,7 @@ do { \ · 14 unmodified lines
1515 * for l0/l1. It will use one for 'next' and the other to hold
1616 * the output value of 'last'. 'next' is not referenced again
1717 * past the invocation of switch_to in the scheduler, so we need
18− * not preserve it's value. Hairy, but it lets us remove 2 loads
18+ * not preserve its value. Hairy, but it lets us remove 2 loads
1919 * and 2 stores in this critical code path. -DaveM
2020 */
2121 #define switch_to(prev, next, last) \
arch/sparc/kernel/btext.c+9−356
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 #include <linux/string.h>
99 #include <linux/init.h>
1010 #include <linux/console.h>
11+#include <linux/font.h>
1112
1213 #include <asm/btext.h>
1314 #include <asm/oplib.h>
@@ -20,9 +21,9 @@ static void scrollscreen(void); · 6 unmodified lines
2021 #endif
2122
2223 static void draw_byte(unsigned char c, long locX, long locY);
23−static void draw_byte_32(unsigned char *bits, unsigned int *base, int rb);
24−static void draw_byte_16(unsigned char *bits, unsigned int *base, int rb);
25−static void draw_byte_8(unsigned char *bits, unsigned int *base, int rb);
24+static void draw_byte_32(const unsigned char *bits, unsigned int *base, int rb);
25+static void draw_byte_16(const unsigned char *bits, unsigned int *base, int rb);
26+static void draw_byte_8(const unsigned char *bits, unsigned int *base, int rb);
2627
2728 #define __force_data __section(".data")
2829
@@ -36,10 +37,6 @@ static int dispDeviceDepth __force_data; · 7 unmodified lines
3637 static int dispDeviceRect[4] __force_data;
3738 static unsigned char *dispDeviceBase __force_data;
3839
39−#define cmapsz (16*256)
40−
41−static unsigned char vga_font[cmapsz];
42−
4340 static int __init btext_initialize(phandle node)
4441 {
4542 unsigned int width, height, depth, pitch;
@@ -194,7 +191,8 @@ static void btext_drawtext(const char *c, unsigned int len) · 148 unmodified lines
194191 static void draw_byte(unsigned char c, long locX, long locY)
195192 {
196193 unsigned char *base = calc_base(locX << 3, locY << 4);
197− unsigned char *font = &vga_font[((unsigned int)c) * 16];
194+ unsigned int font_index = c * 16;
195+ const unsigned char *font = font_sun_8x16.data + font_index;
198196 int rb = dispDeviceRowBytes;
199197
200198 switch(dispDeviceDepth) {
@@ -239,7 +237,7 @@ static unsigned int expand_bits_16[4] = { · 38 unmodified lines
239237 };
240238
241239
242−static void draw_byte_32(unsigned char *font, unsigned int *base, int rb)
240+static void draw_byte_32(const unsigned char *font, unsigned int *base, int rb)
243241 {
244242 int l, bits;
245243 int fg = 0xFFFFFFFFUL;
@@ -260,7 +258,7 @@ static void draw_byte_32(unsigned char *font, unsigned int *base, int rb) · 14 unmodified lines
260258 }
261259 }
262260
263−static void draw_byte_16(unsigned char *font, unsigned int *base, int rb)
261+static void draw_byte_16(const unsigned char *font, unsigned int *base, int rb)
264262 {
265263 int l, bits;
266264 int fg = 0xFFFFFFFFUL;
@@ -278,7 +276,7 @@ static void draw_byte_16(unsigned char *font, unsigned int *base, int rb) · 11 unmodified lines
278276 }
279277 }
280278
281−static void draw_byte_8(unsigned char *font, unsigned int *base, int rb)
279+static void draw_byte_8(const unsigned char *font, unsigned int *base, int rb)
282280 {
283281 int l, bits;
284282 int fg = 0x0F0F0F0FUL;
@@ -326,348 +324,3 @@ int __init btext_find_display(void) · 41 unmodified lines
326324 }
327325 return ret;
328326 }
329−
330−static unsigned char vga_font[cmapsz] = {
331−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
332−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
333−0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xff,
334−0xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
335−0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10,
336−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe,
337−0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
338−0x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
339−0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c,
340−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
341−0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
342−0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
343−0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
344−0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
345−0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x1e, 0x0e,
346−0x1a, 0x32, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
347−0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18,
348−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x33, 0x3f, 0x30, 0x30, 0x30,
349−0x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x63,
350−0x7f, 0x63, 0x63, 0x63, 0x63, 0x67, 0xe7, 0xe6, 0xc0, 0x00, 0x00, 0x00,
351−0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 0x3c, 0xdb, 0x18, 0x18,
352−0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xf8,
353−0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e,
354−0x1e, 0x3e, 0xfe, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
355−0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00,
356−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
357−0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xdb,
358−0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00,
359−0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c, 0xc6,
360−0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
361−0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
362−0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
363−0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
364−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
365−0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
366−0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
367−0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00,
368−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
369−0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
370−0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
371−0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x00,
372−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c,
373−0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
374−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
375−0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
376−0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
377−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c,
378−0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
379−0x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 0x06, 0x86, 0xc6, 0x7c,
380−0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18,
381−0x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
382−0x6c, 0x38, 0x76, 0xdc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
383−0x00, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
384−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
385−0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
386−0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
387−0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
388−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
389−0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
390−0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00,
391−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
392−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
393−0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
394−0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
395−0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0x7c,
396−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18,
397−0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
398−0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
399−0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c,
400−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe,
401−0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
402−0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
403−0x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
404−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18,
405−0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
406−0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
407−0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c, 0x78,
408−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
409−0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
410−0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
411−0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06,
412−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
413−0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
414−0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
415−0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
416−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xde, 0xde,
417−0xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38,
418−0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
419−0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc,
420−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0,
421−0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x6c,
422−0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00,
423−0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe,
424−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68,
425−0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
426−0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00,
427−0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
428−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
429−0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c,
430−0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
431−0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6,
432−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60,
433−0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xe7,
434−0xff, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
435−0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6,
436−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
437−0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66,
438−0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00,
439−0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c,
440−0x0c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c,
441−0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
442−0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
443−0x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
444−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
445−0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
446−0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
447−0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x66,
448−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
449−0x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
450−0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
451−0x00, 0x00, 0xff, 0xc3, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc1, 0xc3, 0xff,
452−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
453−0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
454−0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
455−0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c,
456−0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00,
457−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
458−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
459−0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
460−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c,
461−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60,
462−0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00,
463−0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
464−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc,
465−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
466−0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
467−0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0,
468−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc,
469−0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xe0, 0x60,
470−0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
471−0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
472−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06,
473−0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0xe0, 0x60,
474−0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
475−0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
476−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0xff, 0xdb,
477−0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
478−0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
479−0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
480−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66,
481−0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
482−0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00,
483−0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0,
484−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60,
485−0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30,
486−0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
487−0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
488−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
489−0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
490−0x00, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
491−0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3,
492−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
493−0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
494−0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
495−0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e,
496−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
497−0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x18,
498−0x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
499−0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
500−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6,
501−0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
502−0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x0c, 0x06, 0x7c, 0x00, 0x00,
503−0x00, 0x00, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
504−0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xfe,
505−0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
506−0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
507−0x00, 0x00, 0xcc, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76,
508−0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x78, 0x0c, 0x7c,
509−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38,
510−0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
511−0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x66, 0x3c, 0x0c, 0x06,
512−0x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe,
513−0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
514−0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
515−0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c,
516−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x38, 0x18, 0x18,
517−0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66,
518−0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
519−0x00, 0x60, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
520−0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6,
521−0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x00,
522−0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
523−0x18, 0x30, 0x60, 0x00, 0xfe, 0x66, 0x60, 0x7c, 0x60, 0x60, 0x66, 0xfe,
524−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x1b,
525−0x7e, 0xd8, 0xdc, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x6c,
526−0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00,
527−0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
528−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
529−0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18,
530−0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
531−0x00, 0x30, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
532−0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0xcc, 0xcc, 0xcc,
533−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
534−0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x78, 0x00,
535−0x00, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
536−0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
537−0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
538−0xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
539−0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xe6, 0xfc,
540−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
541−0xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66,
542−0x7c, 0x62, 0x66, 0x6f, 0x66, 0x66, 0x66, 0xf3, 0x00, 0x00, 0x00, 0x00,
543−0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18,
544−0xd8, 0x70, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0x78, 0x0c, 0x7c,
545−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
546−0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
547−0x00, 0x18, 0x30, 0x60, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
548−0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0xcc, 0xcc, 0xcc,
549−0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc,
550−0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
551−0x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6,
552−0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00,
553−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
554−0x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
555−0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 0xc0, 0xc6, 0xc6, 0x7c,
556−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
557−0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
558−0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
559−0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xce, 0x9b, 0x06,
560−0x0c, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30,
561−0x66, 0xce, 0x96, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
562−0x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
563−0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00,
564−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
565−0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x44, 0x11, 0x44,
566−0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44,
567−0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa,
568−0x55, 0xaa, 0x55, 0xaa, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77,
569−0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0x18, 0x18, 0x18, 0x18,
570−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
571−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
572−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
573−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
574−0x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
575−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x36,
576−0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
577−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
578−0x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
579−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
580−0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6,
581−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
582−0x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
583−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x00,
584−0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
585−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
586−0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
587−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00,
588−0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
589−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
590−0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
591−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
592−0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
593−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
594−0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
595−0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
596−0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37,
597−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
598−0x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
599−0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
600−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff,
601−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
602−0x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
603−0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
604−0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
605−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36,
606−0x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
607−0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
608−0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff,
609−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
610−0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
611−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36,
612−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f,
613−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
614−0x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
615−0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
616−0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
617−0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
618−0x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
619−0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18,
620−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
621−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
622−0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
623−0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
624−0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
625−0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
626−0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
627−0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
628−0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
629−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
630−0x00, 0x76, 0xdc, 0xd8, 0xd8, 0xd8, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00,
631−0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xd8, 0xcc, 0xc6, 0xc6, 0xc6, 0xcc,
632−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0,
633−0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
634−0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
635−0x00, 0x00, 0x00, 0xfe, 0xc6, 0x60, 0x30, 0x18, 0x30, 0x60, 0xc6, 0xfe,
636−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8, 0xd8,
637−0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
638−0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xc0, 0x00, 0x00, 0x00,
639−0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
640−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
641−0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
642−0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
643−0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x6c, 0xee,
644−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x18, 0x0c, 0x3e, 0x66,
645−0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
646−0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
647−0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0,
648−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60,
649−0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
650−0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
651−0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00,
652−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
653−0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
654−0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
655−0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e,
656−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x1b, 0x18, 0x18,
657−0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
658−0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00,
659−0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00,
660−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
661−0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
662−0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
663−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00,
664−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
665−0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x0c,
666−0x0c, 0x0c, 0x0c, 0xec, 0x6c, 0x6c, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00,
667−0x00, 0xd8, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00,
668−0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00,
669−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
670−0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
671−0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
672−0x00, 0x00, 0x00, 0x00,
673−};
arch/sparc/kernel/irq_32.c+3−3
@@ -268,11 +268,11 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler) · 267 unmodified lines
268268 if (sparc_cpu_model != sparc_leon) {
269269 struct tt_entry *trap_table;
270270
271− trap_table = &trapbase_cpu1;
271+ trap_table = &trapbase_cpu1[0];
272272 INSTANTIATE(trap_table)
273− trap_table = &trapbase_cpu2;
273+ trap_table = &trapbase_cpu2[0];
274274 INSTANTIATE(trap_table)
275− trap_table = &trapbase_cpu3;
275+ trap_table = &trapbase_cpu3[0];
276276 INSTANTIATE(trap_table)
277277 }
278278 #endif
arch/sparc/kernel/irq_64.c+1−1
@@ -980,7 +980,7 @@ void notrace init_irqwork_curcpu(void) · 979 unmodified lines
980980 *
981981 * On SMP this gets invoked from the CPU trampoline before
982982 * the cpu has fully taken over the trap table from OBP,
983− * and it's kernel stack + %g6 thread register state is
983+ * and its kernel stack + %g6 thread register state is
984984 * not fully cooked yet.
985985 *
986986 * Therefore you cannot make any OBP calls, not even prom_printf,
arch/sparc/kernel/kernel.h+4−4
@@ -138,10 +138,10 @@ extern unsigned int t_nmi[]; · 137 unmodified lines
138138 extern unsigned int linux_trap_ipi15_sun4d[];
139139 extern unsigned int linux_trap_ipi15_sun4m[];
140140
141−extern struct tt_entry trapbase;
142−extern struct tt_entry trapbase_cpu1;
143−extern struct tt_entry trapbase_cpu2;
144−extern struct tt_entry trapbase_cpu3;
141+extern struct tt_entry trapbase[];
142+extern struct tt_entry trapbase_cpu1[];
143+extern struct tt_entry trapbase_cpu2[];
144+extern struct tt_entry trapbase_cpu3[];
145145
146146 extern char cputypval[];
147147
arch/sparc/kernel/kgdb_32.c+2−2
@@ -37,7 +37,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) · 36 unmodified lines
3737 gdb_regs[GDB_Y] = regs->y;
3838 gdb_regs[GDB_PSR] = regs->psr;
3939 gdb_regs[GDB_WIM] = 0;
40− gdb_regs[GDB_TBR] = (unsigned long) &trapbase;
40+ gdb_regs[GDB_TBR] = (unsigned long) &trapbase[0];
4141 gdb_regs[GDB_PC] = regs->pc;
4242 gdb_regs[GDB_NPC] = regs->npc;
4343 gdb_regs[GDB_FSR] = 0;
@@ -72,7 +72,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) · 28 unmodified lines
7272
7373 gdb_regs[GDB_PSR] = t->kpsr;
7474 gdb_regs[GDB_WIM] = t->kwim;
75− gdb_regs[GDB_TBR] = (unsigned long) &trapbase;
75+ gdb_regs[GDB_TBR] = (unsigned long) &trapbase[0];
7676 gdb_regs[GDB_PC] = t->kpc;
7777 gdb_regs[GDB_NPC] = t->kpc + 4;
7878 gdb_regs[GDB_FSR] = 0;
arch/sparc/kernel/kprobes.c+1−1
@@ -230,7 +230,7 @@ static unsigned long __kprobes relbranch_fixup(u32 insn, struct kprobe *p, · 229 unmodified lines
230230 return regs->tnpc;
231231 }
232232
233−/* If INSN is an instruction which writes it's PC location
233+/* If INSN is an instruction which writes its PC location
234234 * into a destination register, fix that up.
235235 */
236236 static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,
arch/sparc/kernel/ldc.c+1−1
@@ -1854,7 +1854,7 @@ static int read_nonraw(struct ldc_channel *lp, void *buf, unsigned int size) · 1853 unmodified lines
18541854 * This seems the best behavior because this allows
18551855 * a user of the LDC layer to start with a small
18561856 * RX buffer for ldc_read() calls and use -EMSGSIZE
1857− * as a cue to enlarge it's read buffer.
1857+ * as a cue to enlarge its read buffer.
18581858 */
18591859 err = -EMSGSIZE;
18601860 break;
arch/sparc/kernel/leon_pci_grpci1.c+1−1
@@ -697,7 +697,7 @@ err1: · 696 unmodified lines
697697 return err;
698698 }
699699
700−static const struct of_device_id grpci1_of_match[] __initconst = {
700+static const struct of_device_id grpci1_of_match[] = {
701701 {
702702 .name = "GAISLER_PCIFBRG",
703703 },
arch/sparc/kernel/leon_pci_grpci2.c+2−2
@@ -586,7 +586,7 @@ static void grpci2_hw_init(struct grpci2_priv *priv) · 585 unmodified lines
586586 REGSTORE(regs->io_map, REGLOAD(regs->io_map) & 0x0000ffff);
587587
588588 /* set 1:1 mapping between AHB -> PCI memory space, for all Masters
589− * Each AHB master has it's own mapping registers. Max 16 AHB masters.
589+ * Each AHB master has its own mapping registers. Max 16 AHB masters.
590590 */
591591 for (i = 0; i < 16; i++)
592592 REGSTORE(regs->ahbmst_map[i], priv->pci_area);
@@ -889,7 +889,7 @@ err1: · 296 unmodified lines
889889 return err;
890890 }
891891
892−static const struct of_device_id grpci2_of_match[] __initconst = {
892+static const struct of_device_id grpci2_of_match[] = {
893893 {
894894 .name = "GAISLER_GRPCI2",
895895 },
arch/sparc/kernel/leon_smp.c+3−3
@@ -245,13 +245,13 @@ void __init leon_smp_done(void) · 244 unmodified lines
245245
246246 /* Free unneeded trap tables */
247247 if (!cpu_present(1)) {
248− free_reserved_page(virt_to_page(&trapbase_cpu1));
248+ free_reserved_page(virt_to_page(&trapbase_cpu1[0]));
249249 }
250250 if (!cpu_present(2)) {
251− free_reserved_page(virt_to_page(&trapbase_cpu2));
251+ free_reserved_page(virt_to_page(&trapbase_cpu2[0]));
252252 }
253253 if (!cpu_present(3)) {
254− free_reserved_page(virt_to_page(&trapbase_cpu3));
254+ free_reserved_page(virt_to_page(&trapbase_cpu3[0]));
255255 }
256256 /* Ok, they are spinning and ready to go. */
257257 smp_processors_ready = 1;
arch/sparc/kernel/nmi.c+1−1
@@ -279,7 +279,7 @@ static int __init setup_nmi_watchdog(char *str) · 278 unmodified lines
279279 if (!strncmp(str, "panic", 5))
280280 panic_on_timeout = 1;
281281
282− return 0;
282+ return 1;
283283 }
284284 __setup("nmi_watchdog=", setup_nmi_watchdog);
285285
arch/sparc/kernel/of_device_64.c+1−1
@@ -560,7 +560,7 @@ static unsigned int __init build_one_device_irq(struct platform_device *op, · 559 unmodified lines
560560 *
561561 * If we hit a bus type or situation we cannot handle, we
562562 * stop and assume that the original IRQ number was in a
563− * format which has special meaning to it's immediate parent.
563+ * format which has special meaning to its immediate parent.
564564 */
565565 pp = dp->parent;
566566 ip = NULL;
arch/sparc/kernel/pci.c+1−1
@@ -311,7 +311,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, · 310 unmodified lines
311311 /* We can't actually use the firmware value, we have
312312 * to read what is in the register right now. One
313313 * reason is that in the case of IDE interfaces the
314− * firmware can sample the value before the the IDE
314+ * firmware can sample the value before the IDE
315315 * interface is programmed into native mode.
316316 */
317317 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
arch/sparc/kernel/pci_impl.h+2−2
@@ -19,9 +19,9 @@ · 18 unmodified lines
1919 * each with one (Sabre) or two (PSYCHO/SCHIZO) PCI bus modules
2020 * underneath. Each PCI bus module uses an IOMMU (shared by both
2121 * PBMs of a controller, or per-PBM), and if a streaming buffer
22− * is present, each PCI bus module has it's own. (ie. the IOMMU
22+ * is present, each PCI bus module has its own. (ie. the IOMMU
2323 * might be shared between PBMs, the STC is never shared)
24− * Furthermore, each PCI bus module controls it's own autonomous
24+ * Furthermore, each PCI bus module controls its own autonomous
2525 * PCI bus.
2626 */
2727
arch/sparc/kernel/pci_schizo.c+2−2
@@ -145,7 +145,7 @@ static void __schizo_check_stc_error_pbm(struct pci_pbm_info *pbm, · 144 unmodified lines
145145
146146 /* This is __REALLY__ dangerous. When we put the
147147 * streaming buffer into diagnostic mode to probe
148− * it's tags and error status, we _must_ clear all
148+ * its tags and error status, we _must_ clear all
149149 * of the line tag valid bits before re-enabling
150150 * the streaming buffer. If any dirty data lives
151151 * in the STC when we do this, we will end up
@@ -275,7 +275,7 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm, · 123 unmodified lines
275275 pbm->name, type_string);
276276
277277 /* Put the IOMMU into diagnostic mode and probe
278− * it's TLB for entries with error status.
278+ * its TLB for entries with error status.
279279 *
280280 * It is very possible for another DVMA to occur
281281 * while we do this probe, and corrupt the system
arch/sparc/kernel/perf_event.c+1−1
@@ -979,7 +979,7 @@ out: · 978 unmodified lines
979979
980980 static void sparc_pmu_start(struct perf_event *event, int flags);
981981
982−/* On this PMU each PIC has it's own PCR control register. */
982+/* On this PMU each PIC has its own PCR control register. */
983983 static void calculate_multiple_pcrs(struct cpu_hw_events *cpuc)
984984 {
985985 int i;
arch/sparc/kernel/prom_irqtrans.c+1−1
@@ -394,7 +394,7 @@ static unsigned int schizo_irq_build(struct device_node *dp, · 393 unmodified lines
394394 iclr = schizo_ino_to_iclr(pbm_regs, ino);
395395
396396 /* On Schizo, no inofixup occurs. This is because each
397− * INO has it's own IMAP register. On Psycho and Sabre
397+ * INO has its own IMAP register. On Psycho and Sabre
398398 * there is only one IMAP register for each PCI slot even
399399 * though four different INOs can be generated by each
400400 * PCI slot.
arch/sparc/kernel/psycho_common.c+1−1
@@ -50,7 +50,7 @@ static void psycho_check_stc_error(struct pci_pbm_info *pbm) · 49 unmodified lines
5050 spin_lock(&stc_buf_lock);
5151
5252 /* This is __REALLY__ dangerous. When we put the streaming
53− * buffer into diagnostic mode to probe it's tags and error
53+ * buffer into diagnostic mode to probe its tags and error
5454 * status, we _must_ clear all of the line tag valid bits
5555 * before re-enabling the streaming buffer. If any dirty data
5656 * lives in the STC when we do this, we will end up
arch/sparc/kernel/setup_32.c+2−2
@@ -67,7 +67,7 @@ static void prom_sync_me(void) · 66 unmodified lines
6767 __asm__ __volatile__("wr %0, 0x0, %%tbr\n\t"
6868 "nop\n\t"
6969 "nop\n\t"
70− "nop\n\t" : : "r" (&trapbase));
70+ "nop\n\t" : : "r" (&trapbase[0]));
7171
7272 prom_printf("PROM SYNC COMMAND...\n");
7373 show_mem();
@@ -285,7 +285,7 @@ void __init setup_arch(char **cmdline_p) · 211 unmodified lines
285285 int i;
286286 unsigned long highest_paddr;
287287
288− sparc_ttable = &trapbase;
288+ sparc_ttable = &trapbase[0];
289289
290290 /* Initialize PROM console and command line. */
291291 *cmdline_p = prom_getbootargs();
arch/sparc/kernel/signal_32.c+1−1
@@ -473,7 +473,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) · 472 unmodified lines
473473 *
474474 * %g7 is used as the "thread register". %g6 is not used in
475475 * any fixed manner. %g6 is used as a scratch register and
476− * a compiler temporary, but it's value is never used across
476+ * a compiler temporary, but its value is never used across
477477 * a system call. Therefore %g6 is usable for orig_i0 storage.
478478 */
479479 if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C))
arch/sparc/kernel/signal_64.c+1−1
@@ -494,7 +494,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) · 493 unmodified lines
494494 *
495495 * %g7 is used as the "thread register". %g6 is not used in
496496 * any fixed manner. %g6 is used as a scratch register and
497− * a compiler temporary, but it's value is never used across
497+ * a compiler temporary, but its value is never used across
498498 * a system call. Therefore %g6 is usable for orig_i0 storage.
499499 */
500500 if (pt_regs_is_syscall(regs) &&
arch/sparc/kernel/vio.c+1−1
@@ -149,7 +149,7 @@ static struct attribute *vio_dev_attrs[] = { · 148 unmodified lines
149149 };
150150 ATTRIBUTE_GROUPS(vio_dev);
151151
152−static struct bus_type vio_bus_type = {
152+static const struct bus_type vio_bus_type = {
153153 .name = "vio",
154154 .dev_groups = vio_dev_groups,
155155 .uevent = vio_hotplug,
arch/sparc/lib/Makefile+2−2
@@ -14,7 +14,7 @@ lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o · 13 unmodified lines
1414 lib-$(CONFIG_SPARC32) += copy_user.o locks.o
1515 lib-$(CONFIG_SPARC64) += atomic_64.o
1616 lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
17−lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
17+lib-$(CONFIG_SPARC32) += muldi3.o bitext.o
1818 lib-$(CONFIG_SPARC64) += multi3.o
1919 lib-$(CONFIG_SPARC64) += fls.o
2020 lib-$(CONFIG_SPARC64) += fls64.o
@@ -51,5 +51,5 @@ lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o · 30 unmodified lines
5151 lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
5252
5353 obj-$(CONFIG_SPARC64) += iomap.o
54−obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o
54+obj-$(CONFIG_SPARC32) += atomic32.o
5555 obj-$(CONFIG_SPARC64) += PeeCeeI.o
arch/sparc/lib/cmpdi2.c+0−28
@@ -1,28 +0,0 @@
1−// SPDX-License-Identifier: GPL-2.0
2−#include <linux/module.h>
3−
4−#include "libgcc.h"
5−
6−word_type __cmpdi2(long long a, long long b)
7−{
8− const DWunion au = {
9− .ll = a
10− };
11− const DWunion bu = {
12− .ll = b
13− };
14−
15− if (au.s.high < bu.s.high)
16− return 0;
17− else if (au.s.high > bu.s.high)
18− return 2;
19−
20− if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
21− return 0;
22− else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
23− return 2;
24−
25− return 1;
26−}
27−
28−EXPORT_SYMBOL(__cmpdi2);
arch/sparc/lib/ucmpdi2.c+0−20
@@ -1,20 +0,0 @@
1−// SPDX-License-Identifier: GPL-2.0
2−#include <linux/module.h>
3−#include "libgcc.h"
4−
5−word_type __ucmpdi2(unsigned long long a, unsigned long long b)
6−{
7− const DWunion au = {.ll = a};
8− const DWunion bu = {.ll = b};
9−
10− if ((unsigned int) au.s.high < (unsigned int) bu.s.high)
11− return 0;
12− else if ((unsigned int) au.s.high > (unsigned int) bu.s.high)
13− return 2;
14− if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
15− return 0;
16− else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
17− return 2;
18− return 1;
19−}
20−EXPORT_SYMBOL(__ucmpdi2);
arch/sparc/mm/srmmu.c+1−1
@@ -1513,7 +1513,7 @@ static void __init init_viking(void) · 1512 unmodified lines
15131513
15141514 /*
15151515 * We need this to make sure old viking takes no hits
1516− * on it's cache for dma snoops to workaround the
1516+ * on its cache for dma snoops to workaround the
15171517 * "load from non-cacheable memory" interrupt bug.
15181518 * This is only necessary because of the new way in
15191519 * which we use the IOMMU.
arch/sparc/mm/tsb.c+1−1
@@ -385,7 +385,7 @@ static unsigned long tsb_size_to_rss_limit(unsigned long new_size) · 384 unmodified lines
385385 * will not trigger any longer.
386386 *
387387 * The TSB can be anywhere from 8K to 1MB in size, in increasing powers
388− * of two. The TSB must be aligned to it's size, so f.e. a 512K TSB
388+ * of two. The TSB must be aligned to its size, so f.e. a 512K TSB
389389 * must be 512K aligned. It also must be physically contiguous, so we
390390 * cannot use vmalloc().
391391 *
arch/sparc/net/bpf_jit_comp_32.c+3−3
@@ -300,7 +300,7 @@ do { *prog++ = BR_OPC | WDISP22(OFF); \ · 299 unmodified lines
300300 *
301301 * The most common case is to emit a branch at the end of such
302302 * a code sequence. So this would be two instructions, the
303− * branch and it's delay slot.
303+ * branch and its delay slot.
304304 *
305305 * Therefore by default the branch emitters calculate the branch
306306 * offset field as:
@@ -309,13 +309,13 @@ do { *prog++ = BR_OPC | WDISP22(OFF); \ · 2 unmodified lines
309309 *
310310 * This "addrs[i] - 8" is the address of the branch itself or
311311 * what "." would be in assembler notation. The "8" part is
312− * how we take into consideration the branch and it's delay
312+ * how we take into consideration the branch and its delay
313313 * slot mentioned above.
314314 *
315315 * Sometimes we need to emit a branch earlier in the code
316316 * sequence. And in these situations we adjust "destination"
317317 * to accommodate this difference. For example, if we needed
318− * to emit a branch (and it's delay slot) right before the
318+ * to emit a branch (and its delay slot) right before the
319319 * final instruction emitted for a BPF opcode, we'd use
320320 * "destination + 4" instead of just plain "destination" above.
321321 *
arch/sparc/vdso/vma.c+3−4
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s) · 448 unmodified lines
449449 unsigned long val;
450450
451451 err = kstrtoul(s, 10, &val);
452− if (err)
453− return err;
454− vdso_enabled = val;
455− return 0;
452+ if (!err)
453+ vdso_enabled = val;
454+ return 1;
456455 }
457456 __setup("vdso=", vdso_setup);
drivers/mtd/maps/sun_uflash.c+1−1
@@ -47,7 +47,7 @@ struct map_info uflash_map_templ = { · 46 unmodified lines
4747 .bankwidth = UFLASH_BUSWIDTH,
4848 };
4949
50−int uflash_devinit(struct platform_device *op, struct device_node *dp)
50+static int uflash_devinit(struct platform_device *op, struct device_node *dp)
5151 {
5252 struct uflash_dev *up;
5353
drivers/sbus/char/bbc_i2c.c+2−7
@@ -358,9 +358,6 @@ fail: · 357 unmodified lines
358358 return NULL;
359359 }
360360
361−extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
362−extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
363−
364361 static int bbc_i2c_probe(struct platform_device *op)
365362 {
366363 struct bbc_i2c_bus *bp;
@@ -385,7 +382,7 @@ static int bbc_i2c_probe(struct platform_device *op) · 18 unmodified lines
385382 return err;
386383 }
387384
388−static int bbc_i2c_remove(struct platform_device *op)
385+static void bbc_i2c_remove(struct platform_device *op)
389386 {
390387 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
391388
@@ -399,8 +396,6 @@ static int bbc_i2c_remove(struct platform_device *op) · 7 unmodified lines
399396 of_iounmap(&op->resource[1], bp->i2c_control_regs, 2);
400397
401398 kfree(bp);
402−
403− return 0;
404399 }
405400
406401 static const struct of_device_id bbc_i2c_match[] = {
@@ -418,7 +413,7 @@ static struct platform_driver bbc_i2c_driver = { · 11 unmodified lines
418413 .of_match_table = bbc_i2c_match,
419414 },
420415 .probe = bbc_i2c_probe,
421− .remove = bbc_i2c_remove,
416+ .remove_new = bbc_i2c_remove,
422417 };
423418
424419 module_platform_driver(bbc_i2c_driver);
drivers/sbus/char/bbc_i2c.h+3−0
@@ -82,4 +82,7 @@ extern int bbc_i2c_readb(struct bbc_i2c_client *, unsigned char *byte, int off); · 81 unmodified lines
8282 extern int bbc_i2c_write_buf(struct bbc_i2c_client *, char *buf, int len, int off);
8383 extern int bbc_i2c_read_buf(struct bbc_i2c_client *, char *buf, int len, int off);
8484
85+extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
86+extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
87+
8588 #endif /* _BBC_I2C_H */
drivers/sbus/char/display7seg.c+2−4
@@ -229,7 +229,7 @@ out_iounmap: · 228 unmodified lines
229229 goto out;
230230 }
231231
232−static int d7s_remove(struct platform_device *op)
232+static void d7s_remove(struct platform_device *op)
233233 {
234234 struct d7s *p = dev_get_drvdata(&op->dev);
235235 u8 regs = readb(p->regs);
@@ -245,8 +245,6 @@ static int d7s_remove(struct platform_device *op) · 9 unmodified lines
245245
246246 misc_deregister(&d7s_miscdev);
247247 of_iounmap(&op->resource[0], p->regs, sizeof(u8));
248−
249− return 0;
250248 }
251249
252250 static const struct of_device_id d7s_match[] = {
@@ -263,7 +261,7 @@ static struct platform_driver d7s_driver = { · 10 unmodified lines
263261 .of_match_table = d7s_match,
264262 },
265263 .probe = d7s_probe,
266− .remove = d7s_remove,
264+ .remove_new = d7s_remove,
267265 };
268266
269267 module_platform_driver(d7s_driver);
drivers/sbus/char/envctrl.c+2−4
@@ -1097,7 +1097,7 @@ out_iounmap: · 1096 unmodified lines
10971097 return err;
10981098 }
10991099
1100−static int envctrl_remove(struct platform_device *op)
1100+static void envctrl_remove(struct platform_device *op)
11011101 {
11021102 int index;
11031103
@@ -1108,8 +1108,6 @@ static int envctrl_remove(struct platform_device *op) · 4 unmodified lines
11081108
11091109 for (index = 0; index < ENVCTRL_MAX_CPU * 2; index++)
11101110 kfree(i2c_childlist[index].tables);
1111−
1112− return 0;
11131111 }
11141112
11151113 static const struct of_device_id envctrl_match[] = {
@@ -1127,7 +1125,7 @@ static struct platform_driver envctrl_driver = { · 11 unmodified lines
11271125 .of_match_table = envctrl_match,
11281126 },
11291127 .probe = envctrl_probe,
1130− .remove = envctrl_remove,
1128+ .remove_new = envctrl_remove,
11311129 };
11321130
11331131 module_platform_driver(envctrl_driver);
drivers/sbus/char/flash.c+2−4
@@ -187,11 +187,9 @@ static int flash_probe(struct platform_device *op) · 186 unmodified lines
187187 return misc_register(&flash_dev);
188188 }
189189
190−static int flash_remove(struct platform_device *op)
190+static void flash_remove(struct platform_device *op)
191191 {
192192 misc_deregister(&flash_dev);
193−
194− return 0;
195193 }
196194
197195 static const struct of_device_id flash_match[] = {
@@ -208,7 +206,7 @@ static struct platform_driver flash_driver = { · 10 unmodified lines
208206 .of_match_table = flash_match,
209207 },
210208 .probe = flash_probe,
211− .remove = flash_remove,
209+ .remove_new = flash_remove,
212210 };
213211
214212 module_platform_driver(flash_driver);
drivers/sbus/char/uctrl.c+2−3
@@ -399,7 +399,7 @@ out_free: · 398 unmodified lines
399399 goto out;
400400 }
401401
402−static int uctrl_remove(struct platform_device *op)
402+static void uctrl_remove(struct platform_device *op)
403403 {
404404 struct uctrl_driver *p = dev_get_drvdata(&op->dev);
405405
@@ -409,7 +409,6 @@ static int uctrl_remove(struct platform_device *op) · 3 unmodified lines
409409 of_iounmap(&op->resource[0], p->regs, resource_size(&op->resource[0]));
410410 kfree(p);
411411 }
412− return 0;
413412 }
414413
415414 static const struct of_device_id uctrl_match[] = {
@@ -426,7 +425,7 @@ static struct platform_driver uctrl_driver = { · 10 unmodified lines
426425 .of_match_table = uctrl_match,
427426 },
428427 .probe = uctrl_probe,
429− .remove = uctrl_remove,
428+ .remove_new = uctrl_remove,
430429 };
431430
432431
lib/fonts/Kconfig+2−1
@@ -98,7 +98,8 @@ config FONT_10x18 · 97 unmodified lines
9898
9999 config FONT_SUN8x16
100100 bool "Sparc console 8x16 font"
101− depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT
101+ depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \
102+ BOOTX_TEXT || EARLYFB
102103 help
103104 This is the high resolution console font for Sun machines. Say Y.
104105

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t