Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3734/1: Fix the unused variable warning in __iounmap()
[ARM] 3737/1: Export ARM copy/clear_user_page symbols
[ARM] 3736/1: xscale: don't mis-report 80219 as an iop32x
[ARM] 3733/2: S3C24XX: Remove old IDE registers in Anubis
[ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines
[ARM] Fix SMP booting
[ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist
[ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig
[ARM] Fix cats build
+76
-60
+10
-5
arch/arm/configs/ep93xx_defconfig
+10
-5
arch/arm/configs/ep93xx_defconfig
···
1
1
#
2
2
# Automatically generated make config: don't edit
3
-
# Linux kernel version: 2.6.18-rc1
4
-
# Sun Jul 9 15:21:30 2006
3
+
# Linux kernel version: 2.6.18-rc1-git9
4
+
# Sat Jul 15 15:08:10 2006
5
5
#
6
6
CONFIG_ARM=y
7
7
CONFIG_MMU=y
···
30
30
CONFIG_SYSVIPC=y
31
31
# CONFIG_POSIX_MQUEUE is not set
32
32
# CONFIG_BSD_PROCESS_ACCT is not set
33
+
# CONFIG_TASKSTATS is not set
33
34
CONFIG_SYSCTL=y
34
35
# CONFIG_AUDIT is not set
35
36
CONFIG_IKCONFIG=y
···
750
749
# USB support
751
750
#
752
751
CONFIG_USB_ARCH_HAS_HCD=y
753
-
# CONFIG_USB_ARCH_HAS_OHCI is not set
752
+
CONFIG_USB_ARCH_HAS_OHCI=y
754
753
# CONFIG_USB_ARCH_HAS_EHCI is not set
755
754
CONFIG_USB=y
756
755
CONFIG_USB_DEBUG=y
···
767
766
# USB Host Controller Drivers
768
767
#
769
768
# CONFIG_USB_ISP116X_HCD is not set
769
+
CONFIG_USB_OHCI_HCD=y
770
+
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
771
+
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
770
772
# CONFIG_USB_SL811_HCD is not set
771
773
772
774
#
···
859
855
CONFIG_USB_SERIAL_PL2303=y
860
856
# CONFIG_USB_SERIAL_HP4X is not set
861
857
# CONFIG_USB_SERIAL_SAFE is not set
858
+
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
862
859
# CONFIG_USB_SERIAL_TI is not set
863
860
# CONFIG_USB_SERIAL_CYBERJACK is not set
864
861
# CONFIG_USB_SERIAL_XIRCOM is not set
···
876
871
# CONFIG_USB_LEGOTOWER is not set
877
872
# CONFIG_USB_LCD is not set
878
873
# CONFIG_USB_LED is not set
879
-
# CONFIG_USB_CY7C63 is not set
874
+
# CONFIG_USB_CYPRESS_CY7C63 is not set
880
875
# CONFIG_USB_CYTHERM is not set
881
876
# CONFIG_USB_PHIDGETKIT is not set
882
877
# CONFIG_USB_PHIDGETSERVO is not set
···
921
916
# CONFIG_RTC_DRV_X1205 is not set
922
917
# CONFIG_RTC_DRV_DS1307 is not set
923
918
# CONFIG_RTC_DRV_DS1553 is not set
919
+
# CONFIG_RTC_DRV_ISL1208 is not set
924
920
# CONFIG_RTC_DRV_DS1672 is not set
925
921
# CONFIG_RTC_DRV_DS1742 is not set
926
922
# CONFIG_RTC_DRV_PCF8563 is not set
···
1029
1023
# CONFIG_RPCSEC_GSS_SPKM3 is not set
1030
1024
# CONFIG_SMB_FS is not set
1031
1025
# CONFIG_CIFS is not set
1032
-
# CONFIG_CIFS_DEBUG2 is not set
1033
1026
# CONFIG_NCP_FS is not set
1034
1027
# CONFIG_CODA_FS is not set
1035
1028
# CONFIG_AFS_FS is not set
+3
-3
arch/arm/kernel/head.S
+3
-3
arch/arm/kernel/head.S
···
114
114
* Use the page tables supplied from __cpu_up.
115
115
*/
116
116
adr r4, __secondary_data
117
-
ldmia r4, {r5, r6, r13} @ address to jump to after
117
+
ldmia r4, {r5, r7, r13} @ address to jump to after
118
118
sub r4, r4, r5 @ mmu has been enabled
119
-
ldr r4, [r6, r4] @ get secondary_data.pgdir
119
+
ldr r4, [r7, r4] @ get secondary_data.pgdir
120
120
adr lr, __enable_mmu @ return address
121
121
add pc, r10, #12 @ initialise processor
122
122
@ (return control reg)
···
125
125
* r6 = &secondary_data
126
126
*/
127
127
ENTRY(__secondary_switched)
128
-
ldr sp, [r6, #4] @ get secondary_data.stack
128
+
ldr sp, [r7, #4] @ get secondary_data.stack
129
129
mov fp, #0
130
130
b secondary_start_kernel
131
131
+1
-1
arch/arm/mach-footbridge/cats-hw.c
+1
-1
arch/arm/mach-footbridge/cats-hw.c
+13
-36
arch/arm/mach-s3c2410/mach-anubis.c
+13
-36
arch/arm/mach-s3c2410/mach-anubis.c
···
60
60
.virtual = (u32)S3C24XX_VA_ISA_BYTE,
61
61
.pfn = __phys_to_pfn(0x0),
62
62
.length = SZ_4M,
63
-
.type = MT_DEVICE
63
+
.type = MT_DEVICE,
64
64
}, {
65
65
.virtual = (u32)S3C24XX_VA_ISA_WORD,
66
66
.pfn = __phys_to_pfn(0x0),
67
-
.length = SZ_4M, MT_DEVICE
67
+
.length = SZ_4M,
68
+
.type = MT_DEVICE,
68
69
},
69
70
70
71
/* we could possibly compress the next set down into a set of smaller tables
···
79
78
.virtual = (u32)ANUBIS_VA_CTRL1,
80
79
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL1),
81
80
.length = SZ_4K,
82
-
.type = MT_DEVICE
81
+
.type = MT_DEVICE,
83
82
}, {
84
83
.virtual = (u32)ANUBIS_VA_CTRL2,
85
84
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
86
85
.length = SZ_4K,
87
-
.type =MT_DEVICE
88
-
},
89
-
90
-
/* IDE drives */
91
-
92
-
{
93
-
.virtual = (u32)ANUBIS_IDEPRI,
94
-
.pfn = __phys_to_pfn(S3C2410_CS3),
95
-
.length = SZ_1M,
96
-
.type = MT_DEVICE
97
-
}, {
98
-
.virtual = (u32)ANUBIS_IDEPRIAUX,
99
-
.pfn = __phys_to_pfn(S3C2410_CS3+(1<<26)),
100
-
.length = SZ_1M,
101
-
.type = MT_DEVICE
102
-
}, {
103
-
.virtual = (u32)ANUBIS_IDESEC,
104
-
.pfn = __phys_to_pfn(S3C2410_CS4),
105
-
.length = SZ_1M,
106
-
.type = MT_DEVICE
107
-
}, {
108
-
.virtual = (u32)ANUBIS_IDESECAUX,
109
-
.pfn = __phys_to_pfn(S3C2410_CS4+(1<<26)),
110
-
.length = SZ_1M,
111
-
.type = MT_DEVICE
86
+
.type = MT_DEVICE,
112
87
},
113
88
};
114
89
···
103
126
.name = "pclk",
104
127
.divisor = 1,
105
128
.min_baud = 0,
106
-
.max_baud = 0.
129
+
.max_baud = 0,
107
130
}
108
131
};
109
132
···
116
139
.ulcon = ULCON,
117
140
.ufcon = UFCON,
118
141
.clocks = anubis_serial_clocks,
119
-
.clocks_size = ARRAY_SIZE(anubis_serial_clocks)
142
+
.clocks_size = ARRAY_SIZE(anubis_serial_clocks),
120
143
},
121
144
[1] = {
122
145
.hwport = 2,
···
125
148
.ulcon = ULCON,
126
149
.ufcon = UFCON,
127
150
.clocks = anubis_serial_clocks,
128
-
.clocks_size = ARRAY_SIZE(anubis_serial_clocks)
151
+
.clocks_size = ARRAY_SIZE(anubis_serial_clocks),
129
152
},
130
153
};
131
154
···
139
162
[0] = {
140
163
.name = "Boot Agent",
141
164
.size = SZ_16K,
142
-
.offset = 0
165
+
.offset = 0,
143
166
},
144
167
[1] = {
145
168
.name = "/boot",
···
171
194
.nr_chips = 1,
172
195
.nr_map = external_map,
173
196
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
174
-
.partitions = anubis_default_nand_part
197
+
.partitions = anubis_default_nand_part,
175
198
},
176
199
[0] = {
177
200
.name = "chip0",
178
201
.nr_chips = 1,
179
202
.nr_map = chip0_map,
180
203
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
181
-
.partitions = anubis_default_nand_part
204
+
.partitions = anubis_default_nand_part,
182
205
},
183
206
[2] = {
184
207
.name = "chip1",
185
208
.nr_chips = 1,
186
209
.nr_map = chip1_map,
187
210
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
188
-
.partitions = anubis_default_nand_part
211
+
.partitions = anubis_default_nand_part,
189
212
},
190
213
};
191
214
···
290
313
.devices = anubis_devices,
291
314
.devices_count = ARRAY_SIZE(anubis_devices),
292
315
.clocks = anubis_clocks,
293
-
.clocks_count = ARRAY_SIZE(anubis_clocks)
316
+
.clocks_count = ARRAY_SIZE(anubis_clocks),
294
317
};
295
318
296
319
static void __init anubis_map_io(void)
+10
-10
arch/arm/mach-s3c2410/mach-osiris.c
+10
-10
arch/arm/mach-s3c2410/mach-osiris.c
···
67
67
.virtual = (u32)OSIRIS_VA_CTRL1,
68
68
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL1),
69
69
.length = SZ_16K,
70
-
.type = MT_DEVICE
70
+
.type = MT_DEVICE,
71
71
}, {
72
72
.virtual = (u32)OSIRIS_VA_CTRL2,
73
73
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL2),
74
74
.length = SZ_16K,
75
-
.type = MT_DEVICE
75
+
.type = MT_DEVICE,
76
76
},
77
77
};
78
78
···
91
91
.name = "pclk",
92
92
.divisor = 1,
93
93
.min_baud = 0,
94
-
.max_baud = 0.
94
+
.max_baud = 0,
95
95
}
96
96
};
97
97
···
103
103
.ulcon = ULCON,
104
104
.ufcon = UFCON,
105
105
.clocks = osiris_serial_clocks,
106
-
.clocks_size = ARRAY_SIZE(osiris_serial_clocks)
106
+
.clocks_size = ARRAY_SIZE(osiris_serial_clocks),
107
107
},
108
108
[1] = {
109
109
.hwport = 1,
···
112
112
.ulcon = ULCON,
113
113
.ufcon = UFCON,
114
114
.clocks = osiris_serial_clocks,
115
-
.clocks_size = ARRAY_SIZE(osiris_serial_clocks)
115
+
.clocks_size = ARRAY_SIZE(osiris_serial_clocks),
116
116
},
117
117
};
118
118
···
126
126
[0] = {
127
127
.name = "Boot Agent",
128
128
.size = SZ_16K,
129
-
.offset = 0
129
+
.offset = 0,
130
130
},
131
131
[1] = {
132
132
.name = "/boot",
···
158
158
.nr_chips = 1,
159
159
.nr_map = external_map,
160
160
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
161
-
.partitions = osiris_default_nand_part
161
+
.partitions = osiris_default_nand_part,
162
162
},
163
163
[0] = {
164
164
.name = "chip0",
165
165
.nr_chips = 1,
166
166
.nr_map = chip0_map,
167
167
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
168
-
.partitions = osiris_default_nand_part
168
+
.partitions = osiris_default_nand_part,
169
169
},
170
170
[2] = {
171
171
.name = "chip1",
172
172
.nr_chips = 1,
173
173
.nr_map = chip1_map,
174
174
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
175
-
.partitions = osiris_default_nand_part
175
+
.partitions = osiris_default_nand_part,
176
176
},
177
177
};
178
178
···
245
245
.devices = osiris_devices,
246
246
.devices_count = ARRAY_SIZE(osiris_devices),
247
247
.clocks = osiris_clocks,
248
-
.clocks_count = ARRAY_SIZE(osiris_clocks)
248
+
.clocks_count = ARRAY_SIZE(osiris_clocks),
249
249
};
250
250
251
251
static void __init osiris_map_io(void)
+2
arch/arm/mm/ioremap.c
+2
arch/arm/mm/ioremap.c
+8
arch/arm/mm/proc-syms.c
+8
arch/arm/mm/proc-syms.c
···
13
13
#include <asm/cacheflush.h>
14
14
#include <asm/proc-fns.h>
15
15
#include <asm/tlbflush.h>
16
+
#include <asm/page.h>
16
17
17
18
#ifndef MULTI_CPU
18
19
EXPORT_SYMBOL(cpu_dcache_clean_area);
···
29
28
EXPORT_SYMBOL(__cpuc_coherent_kern_range);
30
29
#else
31
30
EXPORT_SYMBOL(cpu_cache);
31
+
#endif
32
+
33
+
#ifndef MULTI_USER
34
+
EXPORT_SYMBOL(__cpu_clear_user_page);
35
+
EXPORT_SYMBOL(__cpu_copy_user_page);
36
+
#else
37
+
EXPORT_SYMBOL(cpu_user);
32
38
#endif
33
39
34
40
/*
+29
-1
arch/arm/mm/proc-xscale.S
+29
-1
arch/arm/mm/proc-xscale.S
···
536
536
.asciz "XScale-80200"
537
537
.size cpu_80200_name, . - cpu_80200_name
538
538
539
+
.type cpu_80219_name, #object
540
+
cpu_80219_name:
541
+
.asciz "XScale-80219"
542
+
.size cpu_80219_name, . - cpu_80219_name
543
+
539
544
.type cpu_8032x_name, #object
540
545
cpu_8032x_name:
541
546
.asciz "XScale-IOP8032x Family"
···
618
613
.long xscale_cache_fns
619
614
.size __80200_proc_info, . - __80200_proc_info
620
615
616
+
.type __80219_proc_info,#object
617
+
__80219_proc_info:
618
+
.long 0x69052e20
619
+
.long 0xffffffe0
620
+
.long PMD_TYPE_SECT | \
621
+
PMD_SECT_BUFFERABLE | \
622
+
PMD_SECT_CACHEABLE | \
623
+
PMD_SECT_AP_WRITE | \
624
+
PMD_SECT_AP_READ
625
+
.long PMD_TYPE_SECT | \
626
+
PMD_SECT_AP_WRITE | \
627
+
PMD_SECT_AP_READ
628
+
b __xscale_setup
629
+
.long cpu_arch_name
630
+
.long cpu_elf_name
631
+
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
632
+
.long cpu_80219_name
633
+
.long xscale_processor_functions
634
+
.long v4wbi_tlb_fns
635
+
.long xscale_mc_user_fns
636
+
.long xscale_cache_fns
637
+
.size __80219_proc_info, . - __80219_proc_info
638
+
621
639
.type __8032x_proc_info,#object
622
640
__8032x_proc_info:
623
641
.long 0x69052420
624
-
.long 0xfffff5e0 @ mask should accomodate IOP80219 also
642
+
.long 0xffffffe0
625
643
.long PMD_TYPE_SECT | \
626
644
PMD_SECT_BUFFERABLE | \
627
645
PMD_SECT_CACHEABLE | \
-4
include/asm-arm/arch-iop3xx/iop331-irqs.h
-4
include/asm-arm/arch-iop3xx/iop331-irqs.h
···
91
91
#define NR_IRQS NR_IOP331_IRQS
92
92
93
93
94
-
#if defined(CONFIG_ARCH_IQ80331)
95
94
/*
96
95
* Interrupts available on the IQ80331 board
97
96
*/
···
110
111
#define IRQ_IQ80331_INTC IRQ_IOP331_XINT2
111
112
#define IRQ_IQ80331_INTD IRQ_IOP331_XINT3
112
113
113
-
#elif defined(CONFIG_MACH_IQ80332)
114
114
/*
115
115
* Interrupts available on the IQ80332 board
116
116
*/
···
128
130
#define IRQ_IQ80332_INTB IRQ_IOP331_XINT1
129
131
#define IRQ_IQ80332_INTC IRQ_IOP331_XINT2
130
132
#define IRQ_IQ80332_INTD IRQ_IOP331_XINT3
131
-
132
-
#endif
133
133
134
134
#endif // _IOP331_IRQ_H_