Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
09d4a80e
Commit
09d4a80e
authored
Aug 25, 2005
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge HEAD from ../from-linus
parents
d0d59b98
9c2c38a1
Changes
70
Hide whitespace changes
Inline
Side-by-side
Showing
70 changed files
with
196 additions
and
178 deletions
+196
-178
Makefile
Makefile
+1
-1
arch/alpha/Kconfig
arch/alpha/Kconfig
+1
-1
arch/alpha/kernel/smp.c
arch/alpha/kernel/smp.c
+3
-3
arch/alpha/oprofile/common.c
arch/alpha/oprofile/common.c
+3
-3
arch/arm/Kconfig
arch/arm/Kconfig
+1
-1
arch/arm/kernel/traps.c
arch/arm/kernel/traps.c
+1
-1
arch/arm/nwfpe/fpopcode.h
arch/arm/nwfpe/fpopcode.h
+3
-3
arch/i386/kernel/traps.c
arch/i386/kernel/traps.c
+6
-4
arch/ia64/pci/pci.c
arch/ia64/pci/pci.c
+1
-0
arch/m32r/Kconfig
arch/m32r/Kconfig
+2
-1
arch/m32r/Kconfig.debug
arch/m32r/Kconfig.debug
+1
-1
arch/m32r/kernel/setup_m32700ut.c
arch/m32r/kernel/setup_m32700ut.c
+3
-1
arch/m32r/kernel/setup_opsput.c
arch/m32r/kernel/setup_opsput.c
+3
-1
arch/m32r/kernel/smpboot.c
arch/m32r/kernel/smpboot.c
+1
-0
arch/m32r/lib/csum_partial_copy.c
arch/m32r/lib/csum_partial_copy.c
+1
-0
arch/m32r/mm/discontig.c
arch/m32r/mm/discontig.c
+2
-0
arch/ppc/Kconfig
arch/ppc/Kconfig
+4
-1
arch/ppc/platforms/4xx/Kconfig
arch/ppc/platforms/4xx/Kconfig
+10
-4
arch/ppc64/kernel/setup.c
arch/ppc64/kernel/setup.c
+2
-0
arch/s390/kernel/cpcmd.c
arch/s390/kernel/cpcmd.c
+4
-4
arch/sparc64/kernel/pci.c
arch/sparc64/kernel/pci.c
+1
-0
arch/x86_64/defconfig
arch/x86_64/defconfig
+13
-8
arch/x86_64/pci/k8-bus.c
arch/x86_64/pci/k8-bus.c
+11
-2
drivers/block/cfq-iosched.c
drivers/block/cfq-iosched.c
+21
-10
drivers/char/Kconfig
drivers/char/Kconfig
+4
-4
drivers/infiniband/Kconfig
drivers/infiniband/Kconfig
+1
-0
drivers/isdn/hisax/Kconfig
drivers/isdn/hisax/Kconfig
+1
-0
drivers/macintosh/Kconfig
drivers/macintosh/Kconfig
+1
-1
drivers/media/video/Kconfig
drivers/media/video/Kconfig
+1
-1
drivers/net/Kconfig
drivers/net/Kconfig
+2
-2
drivers/net/ibm_emac/ibm_emac_core.c
drivers/net/ibm_emac/ibm_emac_core.c
+1
-2
drivers/net/tokenring/Kconfig
drivers/net/tokenring/Kconfig
+1
-1
drivers/net/wireless/Kconfig
drivers/net/wireless/Kconfig
+1
-1
drivers/parport/Kconfig
drivers/parport/Kconfig
+1
-1
drivers/pcmcia/pcmcia_resource.c
drivers/pcmcia/pcmcia_resource.c
+1
-0
drivers/s390/cio/qdio.c
drivers/s390/cio/qdio.c
+1
-1
drivers/s390/crypto/z90crypt.h
drivers/s390/crypto/z90crypt.h
+0
-9
drivers/scsi/Kconfig
drivers/scsi/Kconfig
+3
-3
drivers/scsi/ahci.c
drivers/scsi/ahci.c
+1
-0
drivers/scsi/arm/Kconfig
drivers/scsi/arm/Kconfig
+1
-1
drivers/scsi/ata_piix.c
drivers/scsi/ata_piix.c
+1
-1
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+0
-25
drivers/scsi/libata.h
drivers/scsi/libata.h
+1
-1
drivers/scsi/sata_promise.c
drivers/scsi/sata_promise.c
+1
-1
drivers/serial/Kconfig
drivers/serial/Kconfig
+2
-2
drivers/serial/m32r_sio.c
drivers/serial/m32r_sio.c
+1
-1
drivers/usb/net/usbnet.c
drivers/usb/net/usbnet.c
+1
-1
drivers/video/console/Kconfig
drivers/video/console/Kconfig
+1
-1
include/asm-alpha/system.h
include/asm-alpha/system.h
+13
-16
include/asm-arm/arch-ixp4xx/timex.h
include/asm-arm/arch-ixp4xx/timex.h
+4
-2
include/asm-arm/bug.h
include/asm-arm/bug.h
+1
-1
include/asm-arm/cpu-multi32.h
include/asm-arm/cpu-multi32.h
+1
-1
include/asm-arm/cpu-single.h
include/asm-arm/cpu-single.h
+1
-1
include/asm-m32r/smp.h
include/asm-m32r/smp.h
+0
-2
include/asm-m68k/page.h
include/asm-m68k/page.h
+3
-3
include/asm-ppc/time.h
include/asm-ppc/time.h
+1
-1
include/asm-s390/uaccess.h
include/asm-s390/uaccess.h
+2
-19
include/sound/core.h
include/sound/core.h
+2
-0
kernel/cpuset.c
kernel/cpuset.c
+19
-0
lib/vsprintf.c
lib/vsprintf.c
+4
-1
net/rose/rose_route.c
net/rose/rose_route.c
+1
-1
sound/Kconfig
sound/Kconfig
+1
-1
sound/core/Makefile
sound/core/Makefile
+1
-1
sound/core/sound.c
sound/core/sound.c
+1
-1
sound/isa/Kconfig
sound/isa/Kconfig
+1
-1
sound/oss/Kconfig
sound/oss/Kconfig
+8
-8
sound/oss/Makefile
sound/oss/Makefile
+1
-1
sound/oss/i810_audio.c
sound/oss/i810_audio.c
+2
-2
sound/oss/vidc.h
sound/oss/vidc.h
+0
-4
sound/pci/Kconfig
sound/pci/Kconfig
+1
-1
No files found.
Makefile
View file @
09d4a80e
VERSION
=
2
PATCHLEVEL
=
6
SUBLEVEL
=
13
EXTRAVERSION
=
-rc
6
EXTRAVERSION
=
-rc
7
NAME
=
Woozy Numbat
# *DOCUMENTATION*
...
...
arch/alpha/Kconfig
View file @
09d4a80e
...
...
@@ -522,7 +522,7 @@ source "mm/Kconfig"
config NUMA
bool "NUMA Support (EXPERIMENTAL)"
depends on DISCONTIGMEM
depends on DISCONTIGMEM
&& BROKEN
help
Say Y to compile the kernel to support NUMA (Non-Uniform Memory
Access). This option is for configuring high-end multiprocessor
...
...
arch/alpha/kernel/smp.c
View file @
09d4a80e
...
...
@@ -1036,7 +1036,7 @@ debug_spin_lock(spinlock_t * lock, const char *base_file, int line_no)
" br 1b
\n
"
".previous"
:
"=r"
(
tmp
),
"=m"
(
lock
->
lock
),
"=r"
(
stuck
)
:
"
1
"
(
lock
->
lock
),
"2"
(
stuck
)
:
"memory"
);
:
"
m
"
(
lock
->
lock
),
"2"
(
stuck
)
:
"memory"
);
if
(
stuck
<
0
)
{
printk
(
KERN_WARNING
...
...
@@ -1115,7 +1115,7 @@ void _raw_write_lock(rwlock_t * lock)
".previous"
:
"=m"
(
*
(
volatile
int
*
)
lock
),
"=&r"
(
regx
),
"=&r"
(
regy
),
"=&r"
(
stuck_lock
),
"=&r"
(
stuck_reader
)
:
"
0
"
(
*
(
volatile
int
*
)
lock
),
"3"
(
stuck_lock
),
"4"
(
stuck_reader
)
:
"memory"
);
:
"
m
"
(
*
(
volatile
int
*
)
lock
),
"3"
(
stuck_lock
),
"4"
(
stuck_reader
)
:
"memory"
);
if
(
stuck_lock
<
0
)
{
printk
(
KERN_WARNING
"write_lock stuck at %p
\n
"
,
inline_pc
);
...
...
@@ -1153,7 +1153,7 @@ void _raw_read_lock(rwlock_t * lock)
" br 1b
\n
"
".previous"
:
"=m"
(
*
(
volatile
int
*
)
lock
),
"=&r"
(
regx
),
"=&r"
(
stuck_lock
)
:
"
0
"
(
*
(
volatile
int
*
)
lock
),
"2"
(
stuck_lock
)
:
"memory"
);
:
"
m
"
(
*
(
volatile
int
*
)
lock
),
"2"
(
stuck_lock
)
:
"memory"
);
if
(
stuck_lock
<
0
)
{
printk
(
KERN_WARNING
"read_lock stuck at %p
\n
"
,
inline_pc
);
...
...
arch/alpha/oprofile/common.c
View file @
09d4a80e
...
...
@@ -65,7 +65,7 @@ op_axp_setup(void)
model
->
reg_setup
(
&
reg
,
ctr
,
&
sys
);
/* Configure the registers on all cpus. */
smp_call_function
(
model
->
cpu_setup
,
&
reg
,
0
,
1
);
(
void
)
smp_call_function
(
model
->
cpu_setup
,
&
reg
,
0
,
1
);
model
->
cpu_setup
(
&
reg
);
return
0
;
}
...
...
@@ -86,7 +86,7 @@ op_axp_cpu_start(void *dummy)
static
int
op_axp_start
(
void
)
{
smp_call_function
(
op_axp_cpu_start
,
NULL
,
0
,
1
);
(
void
)
smp_call_function
(
op_axp_cpu_start
,
NULL
,
0
,
1
);
op_axp_cpu_start
(
NULL
);
return
0
;
}
...
...
@@ -101,7 +101,7 @@ op_axp_cpu_stop(void *dummy)
static
void
op_axp_stop
(
void
)
{
smp_call_function
(
op_axp_cpu_stop
,
NULL
,
0
,
1
);
(
void
)
smp_call_function
(
op_axp_cpu_stop
,
NULL
,
0
,
1
);
op_axp_cpu_stop
(
NULL
);
}
...
...
arch/arm/Kconfig
View file @
09d4a80e
...
...
@@ -310,7 +310,7 @@ menu "Kernel Features"
config SMP
bool "Symmetric Multi-Processing (EXPERIMENTAL)"
depends on EXPERIMENTAL #&& n
depends on EXPERIMENTAL
&& BROKEN
#&& n
help
This enables support for systems with more than one CPU. If you have
a system with only one CPU, like most personal computers, say N. If
...
...
arch/arm/kernel/traps.c
View file @
09d4a80e
...
...
@@ -617,7 +617,7 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs)
notify_die
(
"unknown data abort code"
,
regs
,
&
info
,
instr
,
0
);
}
vo
latile
void
__bug
(
const
char
*
file
,
int
line
,
void
*
data
)
vo
id
__attribute__
((
noreturn
))
__bug
(
const
char
*
file
,
int
line
,
void
*
data
)
{
printk
(
KERN_CRIT
"kernel BUG at %s:%d!"
,
file
,
line
);
if
(
data
)
...
...
arch/arm/nwfpe/fpopcode.h
View file @
09d4a80e
...
...
@@ -370,20 +370,20 @@ TABLE 5
#define getRoundingMode(opcode) ((opcode & MASK_ROUNDING_MODE) >> 5)
#ifdef CONFIG_FPE_NWFPE_XP
static
inline
const
floatx80
getExtendedConstant
(
const
unsigned
int
nIndex
)
static
inline
__attribute_pure__
floatx80
getExtendedConstant
(
const
unsigned
int
nIndex
)
{
extern
const
floatx80
floatx80Constant
[];
return
floatx80Constant
[
nIndex
];
}
#endif
static
inline
const
float64
getDoubleConstant
(
const
unsigned
int
nIndex
)
static
inline
__attribute_pure__
float64
getDoubleConstant
(
const
unsigned
int
nIndex
)
{
extern
const
float64
float64Constant
[];
return
float64Constant
[
nIndex
];
}
static
inline
const
float32
getSingleConstant
(
const
unsigned
int
nIndex
)
static
inline
__attribute_pure__
float32
getSingleConstant
(
const
unsigned
int
nIndex
)
{
extern
const
float32
float32Constant
[];
return
float32Constant
[
nIndex
];
...
...
arch/i386/kernel/traps.c
View file @
09d4a80e
...
...
@@ -803,15 +803,17 @@ void math_error(void __user *eip)
*/
cwd
=
get_fpu_cwd
(
task
);
swd
=
get_fpu_swd
(
task
);
switch
(
((
~
cwd
)
&
swd
&
0x3f
)
|
(
swd
&
0x240
)
)
{
switch
(
swd
&
~
cwd
&
0x3f
)
{
case
0x000
:
default:
break
;
case
0x001
:
/* Invalid Op */
case
0x041
:
/* Stack Fault */
case
0x241
:
/* Stack Fault | Direction */
/*
* swd & 0x240 == 0x040: Stack Underflow
* swd & 0x240 == 0x240: Stack Overflow
* User must clear the SF bit (0x40) if set
*/
info
.
si_code
=
FPE_FLTINV
;
/* Should we clear the SF or let user space do it ???? */
break
;
case
0x002
:
/* Denormalize */
case
0x010
:
/* Underflow */
...
...
arch/ia64/pci/pci.c
View file @
09d4a80e
...
...
@@ -380,6 +380,7 @@ void pcibios_bus_to_resource(struct pci_dev *dev,
res
->
start
=
region
->
start
+
offset
;
res
->
end
=
region
->
end
+
offset
;
}
EXPORT_SYMBOL
(
pcibios_bus_to_resource
);
static
int
__devinit
is_valid_resource
(
struct
pci_dev
*
dev
,
int
idx
)
{
...
...
arch/m32r/Kconfig
View file @
09d4a80e
...
...
@@ -269,7 +269,7 @@ config NR_CPUS
# Common NUMA Features
config NUMA
bool "Numa Memory Allocation Support"
depends on SMP
depends on SMP
&& BROKEN
default n
# turning this on wastes a bunch of space.
...
...
@@ -286,6 +286,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
config PCI
bool "PCI support"
depends on BROKEN
default n
help
Find out whether you have a PCI motherboard. PCI is the name of a
...
...
arch/m32r/Kconfig.debug
View file @
09d4a80e
...
...
@@ -20,7 +20,7 @@ config DEBUG_STACK_USAGE
config DEBUG_PAGEALLOC
bool "Page alloc debugging"
depends on DEBUG_KERNEL
depends on DEBUG_KERNEL
&& BROKEN
help
Unmap pages from the kernel linear mapping after free_pages().
This results in a large slowdown, but helps to find certain types
...
...
arch/m32r/kernel/setup_m32700ut.c
View file @
09d4a80e
...
...
@@ -30,9 +30,11 @@
typedef
struct
{
unsigned
long
icucr
;
/* ICU Control Register */
}
icu_data_t
;
static
icu_data_t
icu_data
[
M32700UT_NUM_CPU_IRQ
];
#else
icu_data_t
icu_data
[
M32700UT_NUM_CPU_IRQ
];
#endif
/* CONFIG_SMP */
static
icu_data_t
icu_data
[
M32700UT_NUM_CPU_IRQ
];
static
void
disable_m32700ut_irq
(
unsigned
int
irq
)
{
...
...
arch/m32r/kernel/setup_opsput.c
View file @
09d4a80e
...
...
@@ -31,9 +31,11 @@
typedef
struct
{
unsigned
long
icucr
;
/* ICU Control Register */
}
icu_data_t
;
static
icu_data_t
icu_data
[
OPSPUT_NUM_CPU_IRQ
];
#else
icu_data_t
icu_data
[
OPSPUT_NUM_CPU_IRQ
];
#endif
/* CONFIG_SMP */
static
icu_data_t
icu_data
[
OPSPUT_NUM_CPU_IRQ
];
static
void
disable_opsput_irq
(
unsigned
int
irq
)
{
...
...
arch/m32r/kernel/smpboot.c
View file @
09d4a80e
...
...
@@ -91,6 +91,7 @@ extern struct {
/* which physical physical ID maps to which logical CPU number */
static
volatile
int
physid_2_cpu
[
NR_CPUS
];
#define physid_to_cpu(physid) physid_2_cpu[physid]
/* which logical CPU number maps to which physical ID */
volatile
int
cpu_2_physid
[
NR_CPUS
];
...
...
arch/m32r/lib/csum_partial_copy.c
View file @
09d4a80e
...
...
@@ -58,3 +58,4 @@ csum_partial_copy_from_user (const unsigned char __user *src,
return
csum_partial
(
dst
,
len
-
missing
,
sum
);
}
EXPORT_SYMBOL
(
csum_partial_copy_from_user
);
EXPORT_SYMBOL
(
csum_partial
);
arch/m32r/mm/discontig.c
View file @
09d4a80e
...
...
@@ -12,12 +12,14 @@
#include <linux/mmzone.h>
#include <linux/initrd.h>
#include <linux/nodemask.h>
#include <linux/module.h>
#include <asm/setup.h>
extern
char
_end
[];
struct
pglist_data
*
node_data
[
MAX_NUMNODES
];
EXPORT_SYMBOL
(
node_data
);
static
bootmem_data_t
node_bdata
[
MAX_NUMNODES
]
__initdata
;
pg_data_t
m32r_node_data
[
MAX_NUMNODES
];
...
...
arch/ppc/Kconfig
View file @
09d4a80e
...
...
@@ -911,6 +911,7 @@ config PPCBUG_NVRAM
default y if PPC_PREP
config SMP
depends on PPC_STD_MMU
bool "Symmetric multi-processing support"
---help---
This enables support for systems with more than one CPU. If you have
...
...
@@ -930,7 +931,7 @@ config SMP
config IRQ_ALL_CPUS
bool "Distribute interrupts on all CPUs by default"
depends on SMP
depends on SMP
&& !MV64360
help
This option gives the kernel permission to distribute IRQs across
multiple CPUs. Saying N here will route all IRQs to the first
...
...
@@ -1121,7 +1122,9 @@ config PROC_HARDWARE
source "drivers/zorro/Kconfig"
if !44x || BROKEN
source kernel/power/Kconfig
endif
config SECCOMP
bool "Enable seccomp to safely compute untrusted bytecode"
...
...
arch/ppc/platforms/4xx/Kconfig
View file @
09d4a80e
...
...
@@ -3,6 +3,11 @@ config 4xx
depends on 40x || 44x
default y
config WANT_EARLY_SERIAL
bool
select SERIAL_8250
default n
menu "IBM 4xx options"
depends on 4xx
...
...
@@ -18,6 +23,7 @@ config ASH
config BUBINGA
bool "Bubinga"
select WANT_EARLY_SERIAL
help
This option enables support for the IBM 405EP evaluation board.
...
...
@@ -70,21 +76,25 @@ choice
config BAMBOO
bool "Bamboo"
select WANT_EARLY_SERIAL
help
This option enables support for the IBM PPC440EP evaluation board.
config EBONY
bool "Ebony"
select WANT_EARLY_SERIAL
help
This option enables support for the IBM PPC440GP evaluation board.
config LUAN
bool "Luan"
select WANT_EARLY_SERIAL
help
This option enables support for the IBM PPC440SP evaluation board.
config OCOTEA
bool "Ocotea"
select WANT_EARLY_SERIAL
help
This option enables support for the IBM PPC440GX evaluation board.
...
...
@@ -230,10 +240,6 @@ config PPC_GEN550
depends on 4xx
default y
config PM
bool "Power Management support (EXPERIMENTAL)"
depends on 4xx && EXPERIMENTAL
choice
prompt "TTYS0 device and default console"
depends on 40x
...
...
arch/ppc64/kernel/setup.c
View file @
09d4a80e
...
...
@@ -706,6 +706,8 @@ void machine_power_off(void)
local_irq_disable
();
while
(
1
)
;
}
/* Used by the G5 thermal driver */
EXPORT_SYMBOL_GPL
(
machine_power_off
);
void
machine_halt
(
void
)
{
...
...
arch/s390/kernel/cpcmd.c
View file @
09d4a80e
...
...
@@ -46,9 +46,9 @@ int __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
"lra 3,0(%4)
\n
"
"lr 5,%5
\n
"
"diag 2,4,0x8
\n
"
"brc 8,
.Litfits
\n
"
"brc 8,
1f
\n
"
"ar 5, %5
\n
"
"
.Litfits
:
\n
"
"
1
:
\n
"
"lr %0,4
\n
"
"lr %1,5
\n
"
:
"=d"
(
return_code
),
"=d"
(
return_len
)
...
...
@@ -64,9 +64,9 @@ int __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
"sam31
\n
"
"diag 2,4,0x8
\n
"
"sam64
\n
"
"brc 8,
.Litfits
\n
"
"brc 8,
1f
\n
"
"agr 5, %5
\n
"
"
.Litfits
:
\n
"
"
1
:
\n
"
"lgr %0,4
\n
"
"lgr %1,5
\n
"
:
"=d"
(
return_code
),
"=d"
(
return_len
)
...
...
arch/sparc64/kernel/pci.c
View file @
09d4a80e
...
...
@@ -540,6 +540,7 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
pbm
->
parent
->
resource_adjust
(
pdev
,
res
,
root
);
}
EXPORT_SYMBOL
(
pcibios_bus_to_resource
);
char
*
__init
pcibios_setup
(
char
*
str
)
{
...
...
arch/x86_64/defconfig
View file @
09d4a80e
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc3
# Fri
Jul 22 16:47:31
2005
# Linux kernel version: 2.6.13-rc
6-git
3
# Fri
Aug 12 16:40:34
2005
#
CONFIG_X86_64=y
CONFIG_64BIT=y
...
...
@@ -280,10 +280,6 @@ CONFIG_IPV6=y
# Network testing
#
# CONFIG_NET_PKTGEN is not set
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
...
...
@@ -459,6 +455,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
CONFIG_SCSI_SATA=y
# CONFIG_SCSI_SATA_AHCI is not set
# CONFIG_SCSI_SATA_SVW is not set
CONFIG_SCSI_ATA_PIIX=y
# CONFIG_SCSI_SATA_NV is not set
...
...
@@ -488,6 +485,7 @@ CONFIG_SCSI_QLA2XXX=y
# CONFIG_SCSI_QLA2300 is not set
# CONFIG_SCSI_QLA2322 is not set
# CONFIG_SCSI_QLA6312 is not set
# CONFIG_SCSI_QLA24XX is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
...
...
@@ -508,9 +506,11 @@ CONFIG_BLK_DEV_DM=y
#
# Fusion MPT device support
#
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
CONFIG_FUSION=y
CONFIG_FUSION_SPI=y
# CONFIG_FUSION_FC is not set
CONFIG_FUSION_MAX_SGE=128
# CONFIG_FUSION_CTL is not set
#
# IEEE 1394 (FireWire) support
...
...
@@ -581,6 +581,7 @@ CONFIG_8139TOO=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
...
...
@@ -620,6 +621,10 @@ CONFIG_S2IO=m
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
#
# ISDN subsystem
...
...
arch/x86_64/pci/k8-bus.c
View file @
09d4a80e
...
...
@@ -47,13 +47,22 @@ fill_mp_bus_to_cpumask(void)
* if there are no busses hanging off of the current
* ldt link then both the secondary and subordinate
* bus number fields are set to 0.
*
* RED-PEN
* This is slightly broken because it assumes
* HT node IDs == Linux node ids, which is not always
* true. However it is probably mostly true.
*/
if
(
!
(
SECONDARY_LDT_BUS_NUMBER
(
ldtbus
)
==
0
&&
SUBORDINATE_LDT_BUS_NUMBER
(
ldtbus
)
==
0
))
{
for
(
j
=
SECONDARY_LDT_BUS_NUMBER
(
ldtbus
);
j
<=
SUBORDINATE_LDT_BUS_NUMBER
(
ldtbus
);
j
++
)
pci_bus_to_node
[
j
]
=
NODE_ID
(
nid
);
j
++
)
{
int
node
=
NODE_ID
(
nid
);
if
(
!
node_online
(
node
))
node
=
0
;
pci_bus_to_node
[
j
]
=
node
;
}
}
}
}
...
...
drivers/block/cfq-iosched.c
View file @
09d4a80e
...
...
@@ -47,7 +47,7 @@ static int cfq_slice_idle = HZ / 100;
/*
* disable queueing at the driver/hardware level
*/
static
int
cfq_max_depth
=
1
;
static
int
cfq_max_depth
=
2
;
/*
* for the hash of cfqq inside the cfqd
...
...
@@ -385,9 +385,15 @@ cfq_choose_req(struct cfq_data *cfqd, struct cfq_rq *crq1, struct cfq_rq *crq2)
return
crq2
;
if
(
crq2
==
NULL
)
return
crq1
;
if
(
cfq_crq_requeued
(
crq1
))
if
(
cfq_crq_requeued
(
crq1
)
&&
!
cfq_crq_requeued
(
crq2
))
return
crq1
;
if
(
cfq_crq_requeued
(
crq2
))
else
if
(
cfq_crq_requeued
(
crq2
)
&&
!
cfq_crq_requeued
(
crq1
))
return
crq2
;
if
(
cfq_crq_is_sync
(
crq1
)
&&
!
cfq_crq_is_sync
(
crq2
))
return
crq1
;
else
if
(
cfq_crq_is_sync
(
crq2
)
&&
!
cfq_crq_is_sync
(
crq1
))
return
crq2
;
s1
=
crq1
->
request
->
sector
;
...
...
@@ -1769,18 +1775,23 @@ static void
cfq_crq_enqueued
(
struct
cfq_data
*
cfqd
,
struct
cfq_queue
*
cfqq
,
struct
cfq_rq
*
crq
)
{
const
int
sync
=
cfq_crq_is_sync
(
crq
)
;
struct
cfq_io_context
*
cic
;
cfqq
->
next_crq
=
cfq_choose_req
(
cfqd
,
cfqq
->
next_crq
,
crq
);
if
(
sync
)
{
struct
cfq_io_context
*
cic
=
crq
->
io_context
;
/*
* we never wait for an async request and we don't allow preemption
* of an async request. so just return early
*/
if
(
!
cfq_crq_is_sync
(
crq
))
return
;
cfq_update_io_thinktime
(
cfqd
,
cic
);
cfq_update_idle_window
(
cfqd
,
cfqq
,
cic
);
cic
=
crq
->
io_context
;
cic
->
last_queue
=
jiffies
;
}
cfq_update_io_thinktime
(
cfqd
,
cic
);
cfq_update_idle_window
(
cfqd
,
cfqq
,
cic
);
cic
->
last_queue
=
jiffies
;
if
(
cfqq
==
cfqd
->
active_queue
)
{
/*
...
...
drivers/char/Kconfig
View file @
09d4a80e
...
...
@@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD
config COMPUTONE
tristate "Computone IntelliPort Plus serial support"
depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
&& (BROKEN || !SPARC32)
---help---
This driver supports the entire family of Intelliport II/Plus
controllers with the exception of the MicroChannel controllers and
...
...
@@ -138,7 +138,7 @@ config CYZ_INTR
config DIGIEPCA
tristate "Digiboard Intelligent Async Support"
depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
&& (!64BIT || BROKEN)
---help---
This is a driver for Digi International's Xx, Xeve, and Xem series
of cards which provide multiple serial ports. You would need
...
...
@@ -208,7 +208,7 @@ config SYNCLINK
config SYNCLINKMP
tristate "SyncLink Multiport support"
depends on SERIAL_NONSTANDARD
depends on SERIAL_NONSTANDARD
&& (BROKEN || !SPARC32)
help
Enable support for the SyncLink Multiport (2 or 4 ports)
serial adapter, running asynchronous and HDLC communications up
...
...
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y && !IA64 && !ARM && !PPC64
depends on RTC!=y && !IA64 && !ARM && !PPC64
&& !M32R && !SPARC32
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
...
...
drivers/infiniband/Kconfig
View file @
09d4a80e
menu "InfiniBand support"
config INFINIBAND
depends on PCI || BROKEN
tristate "InfiniBand support"
---help---
Core support for InfiniBand (IB). Make sure to also select
...
...
drivers/isdn/hisax/Kconfig
View file @
09d4a80e
...
...
@@ -134,6 +134,7 @@ config HISAX_AVM_A1
config HISAX_FRITZPCI
bool "AVM PnP/PCI (Fritz!PnP/PCI)"
depends on BROKEN || !PPC64
help
This enables HiSax support for the AVM "Fritz!PnP" and "Fritz!PCI".
See <file:Documentation/isdn/README.HiSax> on how to configure it.
...
...
drivers/macintosh/Kconfig
View file @
09d4a80e
...
...
@@ -103,7 +103,7 @@ config PMAC_MEDIABAY
# on non-powerbook machines (but only on PMU based ones AFAIK)
config PMAC_BACKLIGHT
bool "Backlight control for LCD screens"
depends on ADB_PMU
depends on ADB_PMU
&& (BROKEN || !PPC64)
help
Say Y here to build in code to manage the LCD backlight on a
Macintosh PowerBook. With this code, the backlight will be turned
...
...
drivers/media/video/Kconfig
View file @
09d4a80e
...
...
@@ -356,7 +356,7 @@ config VIDEO_M32R_AR
config VIDEO_M32R_AR_M64278
tristate "Use Colour AR module M64278(VGA)"
depends on VIDEO_M32R_AR
depends on VIDEO_M32R_AR
&& PLAT_M32700UT
---help---
Say Y here to use the Renesas M64278E-800 camera module,
which supports VGA(640x480 pixcels) size of images.
...
...
drivers/net/Kconfig
View file @
09d4a80e
...
...
@@ -1145,7 +1145,7 @@ config IBMVETH
be called ibmveth.
config IBM_EMAC
tristate
"IBM PPC4xx EMAC driver support"
bool
"IBM PPC4xx EMAC driver support"
depends on 4xx
select CRC32
---help---
...
...
@@ -1154,7 +1154,7 @@ config IBM_EMAC
config IBM_EMAC_ERRMSG
bool "Verbose error messages"
depends on IBM_EMAC
depends on IBM_EMAC
&& BROKEN
config IBM_EMAC_RXB
int "Number of receive buffers"
...
...
drivers/net/ibm_emac/ibm_emac_core.c
View file @
09d4a80e
...
...
@@ -1712,11 +1712,10 @@ struct mal_commac_ops emac_commac_ops = {
};
#ifdef CONFIG_NET_POLL_CONTROLLER
static
int
emac_netpoll
(
struct
net_device
*
ndev
)
static
void
emac_netpoll
(
struct
net_device
*
ndev
)
{
emac_rxeob_dev
((
void
*
)
ndev
,
0
);
emac_txeob_dev
((
void
*
)
ndev
,
0
);
return
0
;
}
#endif
...
...
drivers/net/tokenring/Kconfig
View file @
09d4a80e
...
...
@@ -84,7 +84,7 @@ config 3C359
config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on TR && (PCI || ISA)
depends on TR && (PCI || ISA
&& ISA_DMA_API
)
select FW_LOADER
---help---
This driver provides generic support for token ring adapters
...
...
drivers/net/wireless/Kconfig
View file @
09d4a80e
...
...
@@ -270,7 +270,7 @@ config PCMCIA_HERMES
config AIRO_CS
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
depends on NET_RADIO && PCMCIA
depends on NET_RADIO && PCMCIA
&& (BROKEN || !M32R)
---help---
This is the standard Linux driver to support Cisco/Aironet PCMCIA
802.11 wireless cards. This driver is the same as the Aironet
...
...
drivers/parport/Kconfig
View file @
09d4a80e
...
...
@@ -34,7 +34,7 @@ config PARPORT
config PARPORT_PC
tristate "PC-style hardware"
depends on PARPORT && (!SPARC64 || PCI) && !SPARC32
depends on PARPORT && (!SPARC64 || PCI) && !SPARC32
&& !M32R
---help---
You should say Y here if you have a PC-style parallel port. All
IBM PC compatible computers and some Alphas have PC-style
...
...
drivers/pcmcia/pcmcia_resource.c
View file @
09d4a80e
...
...
@@ -41,6 +41,7 @@ module_param(io_speed, int, 0444);
#ifdef CONFIG_PCMCIA_PROBE
#include <asm/irq.h>
/* mask of IRQs already reserved by other cards, we should avoid using them */
static
u8
pcmcia_used_irq
[
NR_IRQS
];
#endif
...
...
drivers/s390/cio/qdio.c
View file @
09d4a80e
...
...
@@ -230,7 +230,7 @@ qdio_siga_input(struct qdio_q *q)
}
/* locked by the locks in qdio_activate and qdio_cleanup */
static
__u32
*
volatile
static
__u32
volatile
*
qdio_get_indicator
(
void
)
{
int
i
;
...
...
drivers/s390/crypto/z90crypt.h
View file @
09d4a80e
...
...
@@ -35,15 +35,6 @@
#define z90crypt_RELEASE 3 // 2 = PCIXCC, 3 = rewrite for coding standards
#define z90crypt_VARIANT 2 // 2 = added PCIXCC MCL3 and CEX2C support
/**
* If we are not using the sparse checker, __user has no use.
*/
#ifdef __CHECKER__
# define __user __attribute__((noderef, address_space(1)))
#else
# define __user
#endif
/**
* struct ica_rsa_modexpo
*
...
...
drivers/scsi/Kconfig
View file @
09d4a80e
...
...
@@ -1696,7 +1696,7 @@ config TT_DMA_EMUL
config MAC_SCSI
bool "Macintosh NCR5380 SCSI"
depends on MAC && SCSI
depends on MAC && SCSI
=y
help
This is the NCR 5380 SCSI controller included on most of the 68030
based Macintoshes. If you have one of these say Y and read the
...
...
@@ -1717,7 +1717,7 @@ config SCSI_MAC_ESP
config MVME147_SCSI
bool "WD33C93 SCSI driver for MVME147"
depends on MVME147 && SCSI
depends on MVME147 && SCSI
=y
help
Support for the on-board SCSI controller on the Motorola MVME147
single-board computer.
...
...
@@ -1758,7 +1758,7 @@ config SUN3_SCSI
config
SUN3X_ESP
bool
"Sun3x ESP SCSI"
depends
on
SUN3X
&&
SCSI
depends
on
SUN3X
&&
SCSI
=
y
help
The
ESP
was
an
on
-
board
SCSI
controller
used
on
Sun
3
/
80
machines
.
Say
Y
here
to
compile
in
support
for
it
.
...
...
drivers/scsi/ahci.c
View file @
09d4a80e
...
...
@@ -1105,6 +1105,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION
(
"AHCI SATA low-level driver"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DEVICE_TABLE
(
pci
,
ahci_pci_tbl
);
MODULE_VERSION
(
DRV_VERSION
);
module_init
(
ahci_init
);
module_exit
(
ahci_exit
);
drivers/scsi/arm/Kconfig
View file @
09d4a80e
...
...
@@ -3,7 +3,7 @@
#
config SCSI_ACORNSCSI_3
tristate "Acorn SCSI card (aka30) support"
depends on ARCH_ACORN && SCSI
depends on ARCH_ACORN && SCSI
&& BROKEN
help
This enables support for the Acorn SCSI card (aka30). If you have an
Acorn system with one of these, say Y. If unsure, say N.
...
...
drivers/scsi/ata_piix.c
View file @
09d4a80e
...
...
@@ -32,7 +32,7 @@
#include <linux/libata.h>
#define DRV_NAME "ata_piix"
#define DRV_VERSION "1.0
3
"
#define DRV_VERSION "1.0
4
"
enum
{
PIIX_IOCFG
=
0x54
,
/* IDE I/O configuration register */
...
...
drivers/scsi/libata-core.c
View file @
09d4a80e
...
...
@@ -2268,19 +2268,6 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
* spin_lock_irqsave(host_set lock)
*/
/**
* ata_sg_init_one - Prepare a one-entry scatter-gather list.
* @qc: Queued command
* @buf: transfer buffer
* @buflen: length of buf
*
* Builds a single-entry scatter-gather list to initiate a
* transfer utilizing the specified buffer.
*
* LOCKING:
*/
void
ata_sg_init_one
(
struct
ata_queued_cmd
*
qc
,
void
*
buf
,
unsigned
int
buflen
)
{
struct
scatterlist
*
sg
;
...
...
@@ -2312,18 +2299,6 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
* spin_lock_irqsave(host_set lock)
*/
/**
* ata_sg_init - Assign a scatter gather list to a queued command
* @qc: Queued command
* @sg: Scatter-gather list
* @n_elem: length of sg list
*
* Attaches a scatter-gather list to a queued command.
*
* LOCKING:
*/
void
ata_sg_init
(
struct
ata_queued_cmd
*
qc
,
struct
scatterlist
*
sg
,
unsigned
int
n_elem
)
{
...
...
drivers/scsi/libata.h
View file @
09d4a80e
...
...
@@ -26,7 +26,7 @@
#define __LIBATA_H__
#define DRV_NAME "libata"
#define DRV_VERSION "1.1
1
"
/* must be exactly four chars */
#define DRV_VERSION "1.1
2
"
/* must be exactly four chars */
struct
ata_scsi_args
{
u16
*
id
;
...
...
drivers/scsi/sata_promise.c
View file @
09d4a80e
...
...
@@ -40,7 +40,7 @@
#include "sata_promise.h"
#define DRV_NAME "sata_promise"
#define DRV_VERSION "1.0
1
"
#define DRV_VERSION "1.0
2
"
enum
{
...
...
drivers/serial/Kconfig
View file @
09d4a80e
...
...
@@ -211,7 +211,7 @@ comment "Non-8250 serial port support"
config SERIAL_AMBA_PL010
tristate "ARM AMBA PL010 serial port support"
depends on ARM_AMBA
depends on ARM_AMBA
&& (BROKEN || !ARCH_VERSATILE)
select SERIAL_CORE
help
This selects the ARM(R) AMBA(R) PrimeCell PL010 UART. If you have
...
...
@@ -819,7 +819,7 @@ config SERIAL_M32R_SIO_CONSOLE
config SERIAL_M32R_PLDSIO
bool "M32R SIO I/F on a PLD"
depends on SERIAL_M32R_SIO=y
depends on SERIAL_M32R_SIO=y
&& (PLAT_OPSPUT || PALT_USRV || PLAT_M32700UT)
default n
help
Say Y here if you want to use the M32R serial controller
...
...
drivers/serial/m32r_sio.c
View file @
09d4a80e
...
...
@@ -1123,7 +1123,7 @@ static int __init m32r_sio_console_setup(struct console *co, char *options)
return
uart_set_options
(
port
,
co
,
baud
,
parity
,
bits
,
flow
);
}
extern
struct
uart_driver
m32r_sio_reg
;
static
struct
uart_driver
m32r_sio_reg
;
static
struct
console
m32r_sio_console
=
{
.
name
=
"ttyS"
,
.
write
=
m32r_sio_console_write
,
...
...
drivers/usb/net/usbnet.c
View file @
09d4a80e
...
...
@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
// copy the packet data to the new skb
memcpy
(
skb_put
(
gl_skb
,
size
),
packet
->
packet_data
,
size
);
skb_return
(
dev
,
skb
);
skb_return
(
dev
,
gl_
skb
);
}
// advance to the next packet
...
...
drivers/video/console/Kconfig
View file @
09d4a80e
...
...
@@ -6,7 +6,7 @@ menu "Console display driver support"
config VGA_CONSOLE
bool "VGA text console" if EMBEDDED || !X86
depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC
depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !PARISC
&& !ARCH_VERSATILE
default y
help
Saying Y here will allow you to use Linux in text mode through a
...
...
include/asm-alpha/system.h
View file @
09d4a80e
...
...
@@ -443,22 +443,19 @@ __xchg_u64(volatile long *m, unsigned long val)
if something tries to do an invalid xchg(). */
extern
void
__xchg_called_with_bad_pointer
(
void
);
static
inline
unsigned
long
__xchg
(
volatile
void
*
ptr
,
unsigned
long
x
,
int
size
)
{
switch
(
size
)
{
case
1
:
return
__xchg_u8
(
ptr
,
x
);
case
2
:
return
__xchg_u16
(
ptr
,
x
);
case
4
:
return
__xchg_u32
(
ptr
,
x
);
case
8
:
return
__xchg_u64
(
ptr
,
x
);
}
__xchg_called_with_bad_pointer
();
return
x
;
}
#define __xchg(ptr, x, size) \
({ \
unsigned long __xchg__res; \
volatile void *__xchg__ptr = (ptr); \
switch (size) { \
case 1: __xchg__res = __xchg_u8(__xchg__ptr, x); break; \
case 2: __xchg__res = __xchg_u16(__xchg__ptr, x); break; \
case 4: __xchg__res = __xchg_u32(__xchg__ptr, x); break; \
case 8: __xchg__res = __xchg_u64(__xchg__ptr, x); break; \
default: __xchg_called_with_bad_pointer(); __xchg__res = x; \
} \
__xchg__res; \
})
#define xchg(ptr,x) \
({ \
...
...
include/asm-arm/arch-ixp4xx/timex.h
View file @
09d4a80e
...
...
@@ -7,7 +7,9 @@
/*
* We use IXP425 General purpose timer for our timer needs, it runs at
* 66.66... MHz
* 66.66... MHz. We do a convulted calculation of CLOCK_TICK_RATE b/c the
* timer register ignores the bottom 2 bits of the LATCH value.
*/
#define CLOCK_TICK_RATE (66666666)
#define FREQ 66666666
#define CLOCK_TICK_RATE (((FREQ / HZ & ~IXP4XX_OST_RELOAD_MASK) + 1) * HZ)
include/asm-arm/bug.h
View file @
09d4a80e
...
...
@@ -5,7 +5,7 @@
#ifdef CONFIG_BUG
#ifdef CONFIG_DEBUG_BUGVERBOSE
extern
vo
latile
void
__bug
(
const
char
*
file
,
int
line
,
void
*
data
);
extern
vo
id
__bug
(
const
char
*
file
,
int
line
,
void
*
data
)
__attribute__
((
noreturn
)
);
/* give file/line information */
#define BUG() __bug(__FILE__, __LINE__, NULL)
...
...
include/asm-arm/cpu-multi32.h
View file @
09d4a80e
...
...
@@ -31,7 +31,7 @@ extern struct processor {
/*
* Special stuff for a reset
*/
vo
latile
void
(
*
reset
)(
unsigned
long
addr
);
vo
id
(
*
reset
)(
unsigned
long
addr
)
__attribute__
((
noreturn
)
);
/*
* Idle the processor
*/
...
...
include/asm-arm/cpu-single.h
View file @
09d4a80e
...
...
@@ -41,4 +41,4 @@ extern int cpu_do_idle(void);
extern
void
cpu_dcache_clean_area
(
void
*
,
int
);
extern
void
cpu_do_switch_mm
(
unsigned
long
pgd_phys
,
struct
mm_struct
*
mm
);
extern
void
cpu_set_pte
(
pte_t
*
ptep
,
pte_t
pte
);
extern
vo
latile
void
cpu_reset
(
unsigned
long
addr
);
extern
vo
id
cpu_reset
(
unsigned
long
addr
)
__attribute__
((
noreturn
)
);
include/asm-m32r/smp.h
View file @
09d4a80e
...
...
@@ -61,9 +61,7 @@ extern physid_mask_t phys_cpu_present_map;
* Some lowlevel functions might want to know about
* the real CPU ID <-> CPU # mapping.
*/
extern
volatile
int
physid_2_cpu
[
NR_CPUS
];
extern
volatile
int
cpu_2_physid
[
NR_CPUS
];
#define physid_to_cpu(physid) physid_2_cpu[physid]
#define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id]
#define raw_smp_processor_id() (current_thread_info()->cpu)
...
...
include/asm-m68k/page.h
View file @
09d4a80e
...
...
@@ -138,13 +138,13 @@ extern unsigned long m68k_memoffset;
#define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset)
#define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset))
#else
#define __pa(vaddr) virt_to_phys((void *)
vaddr
)
#define __va(paddr) phys_to_virt((unsigned long)
paddr
)
#define __pa(vaddr) virt_to_phys((void *)
(vaddr)
)
#define __va(paddr) phys_to_virt((unsigned long)
(paddr)
)
#endif
#else
/* !CONFIG_SUN3 */
/* This #define is a horrible hack to suppress lots of warnings. --m */
#define __pa(x) ___pa((unsigned long)
x
)
#define __pa(x) ___pa((unsigned long)
(x)
)
static
inline
unsigned
long
___pa
(
unsigned
long
x
)
{
if
(
x
==
0
)
...
...
include/asm-ppc/time.h
View file @
09d4a80e
...
...
@@ -58,7 +58,7 @@ static __inline__ void set_dec(unsigned int val)
/* Accessor functions for the timebase (RTC on 601) registers. */
/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
#ifdef CONFIG_6xx
extern
__inline__
int
const
__USE_RTC
(
void
)
{
extern
__inline__
int
__attribute_pure__
__USE_RTC
(
void
)
{
return
(
mfspr
(
SPRN_PVR
)
>>
16
)
==
1
;
}
#else
...
...
include/asm-s390/uaccess.h
View file @
09d4a80e
...
...
@@ -149,11 +149,11 @@ struct exception_table_entry
})
#endif
#ifndef __CHECKER__
#define __put_user(x, ptr) \
({ \
__typeof__(*(ptr)) __x = (x); \
int __pu_err; \
__chk_user_ptr(ptr); \
switch (sizeof (*(ptr))) { \
case 1: \
case 2: \
...
...
@@ -167,14 +167,6 @@ struct exception_table_entry
} \
__pu_err; \
})
#else
#define __put_user(x, ptr) \
({ \
void __user *p; \
p = (ptr); \
0; \
})
#endif
#define put_user(x, ptr) \
({ \
...
...
@@ -213,11 +205,11 @@ extern int __put_user_bad(void) __attribute__((noreturn));
})
#endif
#ifndef __CHECKER__
#define __get_user(x, ptr) \
({ \
__typeof__(*(ptr)) __x; \
int __gu_err; \
__chk_user_ptr(ptr); \
switch (sizeof(*(ptr))) { \
case 1: \
case 2: \
...
...
@@ -232,15 +224,6 @@ extern int __put_user_bad(void) __attribute__((noreturn));
(x) = __x; \
__gu_err; \
})
#else
#define __get_user(x, ptr) \
({ \
void __user *p; \
p = (ptr); \
0; \
})
#endif
#define get_user(x, ptr) \
({ \
...
...
include/sound/core.h
View file @
09d4a80e
...
...
@@ -360,11 +360,13 @@ int snd_device_free_all(snd_card_t *card, snd_device_cmd_t cmd);
/* isadma.c */
#ifdef CONFIG_ISA_DMA_API
#define DMA_MODE_NO_ENABLE 0x0100
void
snd_dma_program
(
unsigned
long
dma
,
unsigned
long
addr
,
unsigned
int
size
,
unsigned
short
mode
);
void
snd_dma_disable
(
unsigned
long
dma
);
unsigned
int
snd_dma_pointer
(
unsigned
long
dma
,
unsigned
int
size
);
#endif
/* misc.c */
...
...
kernel/cpuset.c
View file @
09d4a80e
...
...
@@ -635,6 +635,25 @@ static void update_cpu_domains(struct cpuset *cur)
if
(
par
==
NULL
||
cpus_empty
(
cur
->
cpus_allowed
))
return
;
/*
* Hack to avoid 2.6.13 partial node dynamic sched domain bug.
* Require the 'cpu_exclusive' cpuset to include all (or none)
* of the CPUs on each node, or return w/o changing sched domains.
* Remove this hack when dynamic sched domains fixed.
*/
{
int
i
,
j
;
for_each_cpu_mask
(
i
,
cur
->
cpus_allowed
)
{
cpumask_t
mask
=
node_to_cpumask
(
cpu_to_node
(
i
));
for_each_cpu_mask
(
j
,
mask
)
{
if
(
!
cpu_isset
(
j
,
cur
->
cpus_allowed
))
return
;
}
}
}
/*
* Get all cpus from parent's cpus_allowed not part of exclusive
* children
...
...
lib/vsprintf.c
View file @
09d4a80e
...
...
@@ -269,6 +269,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
int
qualifier
;
/* 'h', 'l', or 'L' for integer fields */
/* 'z' support added 23/7/1999 S.H. */
/* 'z' changed to 'Z' --davidm 1/25/99 */
/* 't' added for ptrdiff_t */
/* Reject out-of-range values early */
if
(
unlikely
((
int
)
size
<
0
))
{
...
...
@@ -339,7 +340,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
/* get the conversion qualifier */
qualifier
=
-
1
;
if
(
*
fmt
==
'h'
||
*
fmt
==
'l'
||
*
fmt
==
'L'
||
*
fmt
==
'Z'
||
*
fmt
==
'z'
)
{
*
fmt
==
'Z'
||
*
fmt
==
'z'
||
*
fmt
==
't'
)
{
qualifier
=
*
fmt
;
++
fmt
;
if
(
qualifier
==
'l'
&&
*
fmt
==
'l'
)
{
...
...
@@ -467,6 +468,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
num
=
(
signed
long
)
num
;
}
else
if
(
qualifier
==
'Z'
||
qualifier
==
'z'
)
{
num
=
va_arg
(
args
,
size_t
);
}
else
if
(
qualifier
==
't'
)
{
num
=
va_arg
(
args
,
ptrdiff_t
);
}
else
if
(
qualifier
==
'h'
)
{
num
=
(
unsigned
short
)
va_arg
(
args
,
int
);
if
(
flags
&
SIGN
)
...
...
net/rose/rose_route.c
View file @
09d4a80e
...
...
@@ -995,7 +995,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
* 2. It isn't "owned" by any existing route.
*/
if
(
frametype
!=
ROSE_CALL_REQUEST
)
{
/* XXX */
re
t
=
0
;
re
s
=
0
;
goto
out
;
}
...
...
sound/Kconfig
View file @
09d4a80e
...
...
@@ -77,7 +77,7 @@ source "sound/parisc/Kconfig"
endmenu
menu "Open Sound System"
depends on SOUND!=n
&& (BROKEN || (!SPARC32 && !SPARC64))
depends on SOUND!=n
config SOUND_PRIME
tristate "Open Sound System (DEPRECATED)"
...
...
sound/core/Makefile
View file @
09d4a80e
...
...
@@ -5,7 +5,7 @@
snd-objs
:=
sound.o init.o memory.o info.o control.o misc.o
\
device.o wrappers.o
ifeq
($(CONFIG_ISA),y)
ifeq
($(CONFIG_ISA
_DMA_API
),y)
snd-objs
+=
isadma.o
endif
ifeq
($(CONFIG_SND_OSSEMUL),y)
...
...
sound/core/sound.c
View file @
09d4a80e
...
...
@@ -432,7 +432,7 @@ EXPORT_SYMBOL(snd_device_new);
EXPORT_SYMBOL
(
snd_device_register
);
EXPORT_SYMBOL
(
snd_device_free
);
/* isadma.c */
#ifdef CONFIG_ISA
#ifdef CONFIG_ISA
_DMA_API
EXPORT_SYMBOL
(
snd_dma_program
);
EXPORT_SYMBOL
(
snd_dma_disable
);
EXPORT_SYMBOL
(
snd_dma_pointer
);
...
...
sound/isa/Kconfig
View file @
09d4a80e
# ALSA ISA drivers
menu "ISA devices"
depends on SND!=n && ISA
depends on SND!=n && ISA
&& ISA_DMA_API
config SND_AD1848_LIB
tristate
...
...
sound/oss/Kconfig
View file @
09d4a80e
...
...
@@ -6,7 +6,7 @@
# Prompt user for primary drivers.
config SOUND_BT878
tristate "BT878 audio dma"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& PCI
---help---
Audio DMA support for bt878 based grabber boards. As you might have
already noticed, bt878 is listed with two functions in /proc/pci.
...
...
@@ -80,14 +80,14 @@ config SOUND_EMU10K1
config MIDI_EMU10K1
bool "Creative SBLive! MIDI (EXPERIMENTAL)"
depends on SOUND_EMU10K1 && EXPERIMENTAL
depends on SOUND_EMU10K1 && EXPERIMENTAL
&& ISA_DMA_API
help
Say Y if you want to be able to use the OSS /dev/sequencer
interface. This code is still experimental.
config SOUND_FUSION
tristate "Crystal SoundFusion (CS4280/461x)"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& PCI
help
This module drives the Crystal SoundFusion devices (CS4280/46xx
series) when wired as native sound drivers with AC97 codecs. If
...
...
@@ -95,7 +95,7 @@ config SOUND_FUSION
config SOUND_CS4281
tristate "Crystal Sound CS4281"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& PCI
help
Picture and feature list at
<http://www.pcbroker.com/crystal4281.html>.
...
...
@@ -179,7 +179,7 @@ config SOUND_HARMONY
config SOUND_SONICVIBES
tristate "S3 SonicVibes"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& PCI
help
Say Y or M if you have a PCI sound card utilizing the S3
SonicVibes chipset. To find out if your sound card uses a
...
...
@@ -226,7 +226,7 @@ config SOUND_AU1550_AC97
config SOUND_TRIDENT
tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& PCI
---help---
Say Y or M if you have a PCI sound card utilizing the Trident
4DWave-DX/NX chipset or your mother board chipset has SiS 7018
...
...
@@ -503,7 +503,7 @@ config SOUND_VIA82CXXX
config MIDI_VIA82CXXX
bool "VIA 82C686 MIDI"
depends on SOUND_VIA82CXXX
depends on SOUND_VIA82CXXX
&& ISA_DMA_API
help
Answer Y to use the MIDI interface of the Via686. You may need to
enable this in the BIOS before it will work. This is for connection
...
...
@@ -512,7 +512,7 @@ config MIDI_VIA82CXXX
config SOUND_OSS
tristate "OSS sound modules"
depends on SOUND_PRIME
depends on SOUND_PRIME
&& ISA_DMA_API
help
OSS is the Open Sound System suite of sound card drivers. They make
sound programming easier since they provide a common API. Say Y or
...
...
sound/oss/Makefile
View file @
09d4a80e
...
...
@@ -80,7 +80,7 @@ obj-$(CONFIG_SOUND_ALI5455) += ali5455.o ac97_codec.o
obj-$(CONFIG_SOUND_IT8172)
+=
ite8172.o ac97_codec.o
obj-$(CONFIG_SOUND_FORTE)
+=
forte.o ac97_codec.o
obj-$(CONFIG_SOUND_AD1980)
+=
ac97_plugin_ad1980.o
obj-$(CONFIG_SOUND_AD1980)
+=
ac97_plugin_ad1980.o
ac97_codec.o
obj-$(CONFIG_SOUND_WM97XX)
+=
ac97_plugin_wm97xx.o
ifeq
($(CONFIG_MIDI_EMU10K1),y)
...
...
sound/oss/i810_audio.c
View file @
09d4a80e
...
...
@@ -3430,9 +3430,9 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
release_mem_region
(
card
->
iobase_mmio_phys
,
256
);
}
out_pio:
release_region
(
card
->
iobase
,
64
);
out_region2:
release_region
(
card
->
ac97base
,
256
);
out_region2:
release_region
(
card
->
iobase
,
64
);
out_region1:
pci_free_consistent
(
pci_dev
,
sizeof
(
struct
i810_channel
)
*
NR_HW_CH
,
card
->
channel
,
card
->
chandma
);
...
...
sound/oss/vidc.h
View file @
09d4a80e
...
...
@@ -10,10 +10,6 @@
* VIDC sound function prototypes
*/
/* vidc.c */
extern
int
vidc_busy
;
/* vidc_fill.S */
/*
...
...
sound/pci/Kconfig
View file @
09d4a80e
...
...
@@ -314,7 +314,7 @@ config SND_YMFPCI
config SND_ALS4000
tristate "Avance Logic ALS4000"
depends on SND
depends on SND
&& ISA_DMA_API
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment