Skip to content

Commit c89a86b

Browse files
author
Steve French
committed
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <[email protected]>
2 parents 07475ff + e4f5c82 commit c89a86b

File tree

183 files changed

+4564
-4997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+4564
-4997
lines changed

‎MAINTAINERS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ P: Mauro Carvalho Chehab
536536
M: [email protected]
537537
L: [email protected]
538538
W: http://linuxtv.org
539+
T: quilt http://www.linuxtv.org/download/quilt/
539540
S: Maintained
540541

541542
BUSLOGIC SCSI DRIVER
@@ -833,6 +834,7 @@ P: LinuxTV.org Project
833834
M: [email protected]
834835
L: [email protected] (subscription required)
835836
W: http://linuxtv.org/
837+
T: quilt http://www.linuxtv.org/download/quilt/
836838
S: Supported
837839

838840
EATA-DMA SCSI DRIVER
@@ -1634,6 +1636,15 @@ L: [email protected]
16341636
W: http://ldm.sourceforge.net
16351637
S: Maintained
16361638

1639+
LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
1640+
P: Eric Moore
1641+
M: [email protected]
1642+
M: [email protected]
1643+
L: [email protected]
1644+
L: [email protected]
1645+
W: http://www.lsilogic.com/support
1646+
S: Supported
1647+
16371648
LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
16381649
P: Matthew Wilcox
16391650
M: [email protected]
@@ -2885,6 +2896,7 @@ P: Mauro Carvalho Chehab
28852896
M: [email protected]
28862897
L: [email protected]
28872898
W: http://linuxtv.org
2899+
T: quilt http://www.linuxtv.org/download/quilt/
28882900
S: Maintained
28892901

28902902
W1 DALLAS'S 1-WIRE BUS

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 15
4-
EXTRAVERSION =-rc4
4+
EXTRAVERSION =-rc5
55
NAME=Affluent Albatross
66

77
# *DOCUMENTATION*

‎arch/arm/configs/spitz_defconfig

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,24 @@ CONFIG_UNIX98_PTYS=y
897897
#
898898
# I2C support
899899
#
900-
# CONFIG_I2C is not set
900+
CONFIG_I2C=y
901+
# CONFIG_I2C_CHARDEV is not set
902+
903+
#
904+
# I2C Algorithms
905+
#
906+
# CONFIG_I2C_ALGOBIT is not set
907+
# CONFIG_I2C_ALGOPCF is not set
908+
# CONFIG_I2C_ALGOPCA is not set
909+
910+
#
911+
# I2C Hardware Bus support
912+
#
913+
CONFIG_I2C_PXA=y
914+
# CONFIG_I2C_PXA_SLAVE is not set
915+
# CONFIG_I2C_PARPORT_LIGHT is not set
916+
# CONFIG_I2C_STUB is not set
917+
# CONFIG_I2C_PCA_ISA is not set
901918

902919
#
903920
# Hardware Monitoring support

‎arch/arm/mach-ixp4xx/ixdp425-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
8585
{
8686
.mapbase = IXP4XX_UART2_BASE_PHYS,
8787
.membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
88-
.irq = IRQ_IXP4XX_UART1,
88+
.irq = IRQ_IXP4XX_UART2,
8989
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
9090
.iotype = UPIO_MEM,
9191
.regshift = 2,

‎arch/arm/mach-pxa/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ config MACH_AKITA
7777
depends PXA_SHARPSL_27x
7878
select PXA_SHARP_Cxx00
7979
select MACH_SPITZ
80+
select I2C
81+
select I2C_PXA
8082

8183
config MACH_SPITZ
8284
bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

‎arch/arm/mm/flush.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,19 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p
155155
* space mappings, we can be lazy and remember that we may have dirty
156156
* kernel cache lines for later. Otherwise, we assume we have
157157
* aliasing mappings.
158+
*
159+
* Note that we disable the lazy flush for SMP.
158160
*/
159161
void flush_dcache_page(struct page *page)
160162
{
161163
struct address_space *mapping = page_mapping(page);
162164

165+
#ifndef CONFIG_SMP
163166
if (mapping && !mapping_mapped(mapping))
164167
set_bit(PG_dcache_dirty, &page->flags);
165-
else {
168+
else
169+
#endif
170+
{
166171
__flush_dcache_page(mapping, page);
167172
if (mapping && cache_is_vivt())
168173
__flush_dcache_aliases(mapping, page);

‎arch/i386/kernel/acpi/boot.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
638638
return 0;
639639

640640
pmtmr_ioport = fadt->xpm_tmr_blk.address;
641+
/*
642+
* "X" fields are optional extensions to the original V1.0
643+
* fields, so we must selectively expand V1.0 fields if the
644+
* corresponding X field is zero.
645+
*/
646+
if (!pmtmr_ioport)
647+
pmtmr_ioport = fadt->V1_pm_tmr_blk;
641648
} else {
642649
/* FADT rev. 1 */
643650
pmtmr_ioport = fadt->V1_pm_tmr_blk;

‎arch/mips/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ config MIPS
66

77
mainmenu "Linux/MIPS Kernel Configuration"
88

9-
source "init/Kconfig"
10-
119
menu "Machine selection"
1210

1311
choice
@@ -1643,6 +1641,8 @@ config RWSEM_GENERIC_SPINLOCK
16431641
bool
16441642
default y
16451643

1644+
source "init/Kconfig"
1645+
16461646
menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
16471647

16481648
config HW_HAS_EISA

‎arch/mips/au1000/db1x00/board_setup.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@
4545
#include <asm/mach-au1x00/au1000.h>
4646
#include <asm/mach-db1x00/db1x00.h>
4747

48-
/* not correct for db1550 */
49-
static BCSR * const bcsr = (BCSR *)0xAE000000;
48+
static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
5049

5150
void board_reset (void)
5251
{
5352
/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
54-
au_writel(0x00000000, 0xAE00001C);
53+
bcsr->swreset = 0x0000;
5554
}
5655

5756
void __init board_setup(void)
@@ -75,7 +74,7 @@ void __init board_setup(void)
7574
bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
7675
au_sync();
7776
#endif
78-
au_writel(0, 0xAE000010); /* turn off pcmcia power */
77+
bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */
7978

8079
#ifdef CONFIG_MIPS_MIRAGE
8180
/* enable GPIO[31:0] inputs */

‎arch/mips/au1000/db1x00/init.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,17 @@ void __init prom_init(void)
6161
prom_envp = (char **) fw_arg2;
6262

6363
mips_machgroup = MACH_GROUP_ALCHEMY;
64-
mips_machtype = MACH_DB1000; /* set the platform # */
64+
65+
/* Set the platform # */
66+
#if defined (CONFIG_MIPS_DB1550)
67+
mips_machtype = MACH_DB1550;
68+
#elif defined (CONFIG_MIPS_DB1500)
69+
mips_machtype = MACH_DB1500;
70+
#elif defined (CONFIG_MIPS_DB1100)
71+
mips_machtype = MACH_DB1100;
72+
#else
73+
mips_machtype = MACH_DB1000;
74+
#endif
6575

6676
prom_init_cmdline();
6777

‎arch/mips/configs/atlas_defconfig

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,10 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.14
4-
# Thu Nov 10 12:14:02 2005
3+
# Linux kernel version: 2.6.15-rc2
4+
# Thu Nov 24 01:05:52 2005
55
#
66
CONFIG_MIPS=y
77

8-
#
9-
# Code maturity level options
10-
#
11-
CONFIG_EXPERIMENTAL=y
12-
CONFIG_CLEAN_COMPILE=y
13-
CONFIG_BROKEN_ON_SMP=y
14-
CONFIG_INIT_ENV_ARG_LIMIT=32
15-
16-
#
17-
# General setup
18-
#
19-
CONFIG_LOCALVERSION=""
20-
CONFIG_LOCALVERSION_AUTO=y
21-
CONFIG_SWAP=y
22-
CONFIG_SYSVIPC=y
23-
# CONFIG_POSIX_MQUEUE is not set
24-
# CONFIG_BSD_PROCESS_ACCT is not set
25-
CONFIG_SYSCTL=y
26-
# CONFIG_AUDIT is not set
27-
CONFIG_HOTPLUG=y
28-
CONFIG_KOBJECT_UEVENT=y
29-
# CONFIG_IKCONFIG is not set
30-
CONFIG_INITRAMFS_SOURCE=""
31-
CONFIG_EMBEDDED=y
32-
CONFIG_KALLSYMS=y
33-
# CONFIG_KALLSYMS_EXTRA_PASS is not set
34-
CONFIG_PRINTK=y
35-
CONFIG_BUG=y
36-
CONFIG_BASE_FULL=y
37-
CONFIG_FUTEX=y
38-
CONFIG_EPOLL=y
39-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40-
CONFIG_SHMEM=y
41-
CONFIG_CC_ALIGN_FUNCTIONS=0
42-
CONFIG_CC_ALIGN_LABELS=0
43-
CONFIG_CC_ALIGN_LOOPS=0
44-
CONFIG_CC_ALIGN_JUMPS=0
45-
# CONFIG_TINY_SHMEM is not set
46-
CONFIG_BASE_SMALL=0
47-
48-
#
49-
# Loadable module support
50-
#
51-
CONFIG_MODULES=y
52-
CONFIG_MODULE_UNLOAD=y
53-
# CONFIG_MODULE_FORCE_UNLOAD is not set
54-
CONFIG_OBSOLETE_MODPARM=y
55-
CONFIG_MODVERSIONS=y
56-
CONFIG_MODULE_SRCVERSION_ALL=y
57-
CONFIG_KMOD=y
58-
59-
#
60-
# Block layer
61-
#
62-
# CONFIG_LBD is not set
63-
64-
#
65-
# IO Schedulers
66-
#
67-
CONFIG_IOSCHED_NOOP=y
68-
CONFIG_IOSCHED_AS=y
69-
CONFIG_IOSCHED_DEADLINE=y
70-
CONFIG_IOSCHED_CFQ=y
71-
CONFIG_DEFAULT_AS=y
72-
# CONFIG_DEFAULT_DEADLINE is not set
73-
# CONFIG_DEFAULT_CFQ is not set
74-
# CONFIG_DEFAULT_NOOP is not set
75-
CONFIG_DEFAULT_IOSCHED="anticipatory"
76-
778
#
789
# Machine selection
7910
#
@@ -214,6 +145,75 @@ CONFIG_PREEMPT_NONE=y
214145
# CONFIG_PREEMPT_VOLUNTARY is not set
215146
# CONFIG_PREEMPT is not set
216147

148+
#
149+
# Code maturity level options
150+
#
151+
CONFIG_EXPERIMENTAL=y
152+
CONFIG_CLEAN_COMPILE=y
153+
CONFIG_BROKEN_ON_SMP=y
154+
CONFIG_INIT_ENV_ARG_LIMIT=32
155+
156+
#
157+
# General setup
158+
#
159+
CONFIG_LOCALVERSION=""
160+
CONFIG_LOCALVERSION_AUTO=y
161+
CONFIG_SWAP=y
162+
CONFIG_SYSVIPC=y
163+
# CONFIG_POSIX_MQUEUE is not set
164+
# CONFIG_BSD_PROCESS_ACCT is not set
165+
CONFIG_SYSCTL=y
166+
# CONFIG_AUDIT is not set
167+
CONFIG_HOTPLUG=y
168+
CONFIG_KOBJECT_UEVENT=y
169+
# CONFIG_IKCONFIG is not set
170+
CONFIG_INITRAMFS_SOURCE=""
171+
CONFIG_EMBEDDED=y
172+
CONFIG_KALLSYMS=y
173+
# CONFIG_KALLSYMS_EXTRA_PASS is not set
174+
CONFIG_PRINTK=y
175+
CONFIG_BUG=y
176+
CONFIG_BASE_FULL=y
177+
CONFIG_FUTEX=y
178+
CONFIG_EPOLL=y
179+
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180+
CONFIG_SHMEM=y
181+
CONFIG_CC_ALIGN_FUNCTIONS=0
182+
CONFIG_CC_ALIGN_LABELS=0
183+
CONFIG_CC_ALIGN_LOOPS=0
184+
CONFIG_CC_ALIGN_JUMPS=0
185+
# CONFIG_TINY_SHMEM is not set
186+
CONFIG_BASE_SMALL=0
187+
188+
#
189+
# Loadable module support
190+
#
191+
CONFIG_MODULES=y
192+
CONFIG_MODULE_UNLOAD=y
193+
# CONFIG_MODULE_FORCE_UNLOAD is not set
194+
CONFIG_OBSOLETE_MODPARM=y
195+
CONFIG_MODVERSIONS=y
196+
CONFIG_MODULE_SRCVERSION_ALL=y
197+
CONFIG_KMOD=y
198+
199+
#
200+
# Block layer
201+
#
202+
# CONFIG_LBD is not set
203+
204+
#
205+
# IO Schedulers
206+
#
207+
CONFIG_IOSCHED_NOOP=y
208+
CONFIG_IOSCHED_AS=y
209+
CONFIG_IOSCHED_DEADLINE=y
210+
CONFIG_IOSCHED_CFQ=y
211+
CONFIG_DEFAULT_AS=y
212+
# CONFIG_DEFAULT_DEADLINE is not set
213+
# CONFIG_DEFAULT_CFQ is not set
214+
# CONFIG_DEFAULT_NOOP is not set
215+
CONFIG_DEFAULT_IOSCHED="anticipatory"
216+
217217
#
218218
# Bus options (PCI, PCMCIA, EISA, ISA, TC)
219219
#

0 commit comments

Comments
 (0)