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
a2c3c74c
Commit
a2c3c74c
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.4.0-test2pre12
parent
c3285854
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
19 deletions
+14
-19
arch/i386/kernel/pci-irq.c
arch/i386/kernel/pci-irq.c
+7
-8
drivers/block/elevator.c
drivers/block/elevator.c
+2
-2
drivers/block/ll_rw_blk.c
drivers/block/ll_rw_blk.c
+4
-8
include/asm-i386/io_apic.h
include/asm-i386/io_apic.h
+1
-1
No files found.
arch/i386/kernel/pci-irq.c
View file @
a2c3c74c
...
@@ -128,14 +128,13 @@ static void eisa_set_level_irq(unsigned int irq)
...
@@ -128,14 +128,13 @@ static void eisa_set_level_irq(unsigned int irq)
static
int
pirq_ali_get
(
struct
pci_dev
*
router
,
struct
pci_dev
*
dev
,
int
pirq
)
static
int
pirq_ali_get
(
struct
pci_dev
*
router
,
struct
pci_dev
*
dev
,
int
pirq
)
{
{
static
unsigned
char
irqmap
[
16
]
=
{
0
,
9
,
3
,
10
,
4
,
5
,
7
,
6
,
1
,
11
,
0
,
12
,
0
,
14
,
0
,
15
};
static
unsigned
char
irqmap
[
16
]
=
{
0
,
9
,
3
,
10
,
4
,
5
,
7
,
6
,
1
,
11
,
0
,
12
,
0
,
14
,
0
,
15
};
pirq
--
;
if
(
pirq
<
8
)
{
u8
x
;
u8
x
;
unsigned
reg
=
0x48
+
(
pirq
>>
1
);
unsigned
reg
;
pirq
--
;
reg
=
0x48
+
(
pirq
>>
1
);
pci_read_config_byte
(
router
,
reg
,
&
x
);
pci_read_config_byte
(
router
,
reg
,
&
x
);
return
irqmap
[(
pirq
&
1
)
?
(
x
>>
4
)
:
(
x
&
0x0f
)];
return
irqmap
[(
pirq
&
1
)
?
(
x
>>
4
)
:
(
x
&
0x0f
)];
}
return
0
;
}
}
static
int
pirq_ali_set
(
struct
pci_dev
*
router
,
struct
pci_dev
*
dev
,
int
pirq
,
int
irq
)
static
int
pirq_ali_set
(
struct
pci_dev
*
router
,
struct
pci_dev
*
dev
,
int
pirq
,
int
irq
)
...
@@ -143,7 +142,7 @@ static int pirq_ali_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
...
@@ -143,7 +142,7 @@ static int pirq_ali_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i
static
unsigned
char
irqmap
[
16
]
=
{
0
,
8
,
0
,
2
,
4
,
5
,
7
,
6
,
0
,
1
,
3
,
9
,
11
,
0
,
13
,
15
};
static
unsigned
char
irqmap
[
16
]
=
{
0
,
8
,
0
,
2
,
4
,
5
,
7
,
6
,
0
,
1
,
3
,
9
,
11
,
0
,
13
,
15
};
unsigned
int
val
=
irqmap
[
irq
];
unsigned
int
val
=
irqmap
[
irq
];
pirq
--
;
pirq
--
;
if
(
val
&&
pirq
<
8
)
{
if
(
val
)
{
u8
x
;
u8
x
;
unsigned
reg
=
0x48
+
(
pirq
>>
1
);
unsigned
reg
=
0x48
+
(
pirq
>>
1
);
pci_read_config_byte
(
router
,
reg
,
&
x
);
pci_read_config_byte
(
router
,
reg
,
&
x
);
...
...
drivers/block/elevator.c
View file @
a2c3c74c
...
@@ -83,10 +83,10 @@ int elevator_default_merge(request_queue_t *q, struct request **req,
...
@@ -83,10 +83,10 @@ int elevator_default_merge(request_queue_t *q, struct request **req,
latency
=
orig_latency
=
elevator_request_latency
(
elevator
,
rw
);
latency
=
orig_latency
=
elevator_request_latency
(
elevator
,
rw
);
sequence
=
elevator
->
sequence
;
sequence
=
elevator
->
sequence
;
entry
=
head
;
if
(
q
->
head_active
&&
!
q
->
plugged
)
if
(
q
->
head_active
&&
!
q
->
plugged
)
head
=
head
->
next
;
head
=
head
->
next
;
entry
=
head
;
while
((
entry
=
entry
->
prev
)
!=
head
&&
!
starving
)
{
while
((
entry
=
entry
->
prev
)
!=
head
&&
!
starving
)
{
*
req
=
blkdev_entry_to_request
(
entry
);
*
req
=
blkdev_entry_to_request
(
entry
);
latency
+=
(
*
req
)
->
nr_segments
;
latency
+=
(
*
req
)
->
nr_segments
;
...
@@ -161,10 +161,10 @@ int elevator_linus_merge(request_queue_t *q, struct request **req,
...
@@ -161,10 +161,10 @@ int elevator_linus_merge(request_queue_t *q, struct request **req,
struct
list_head
*
entry
,
*
head
=
&
q
->
queue_head
;
struct
list_head
*
entry
,
*
head
=
&
q
->
queue_head
;
unsigned
int
count
=
bh
->
b_size
>>
9
;
unsigned
int
count
=
bh
->
b_size
>>
9
;
entry
=
head
;
if
(
q
->
head_active
&&
!
q
->
plugged
)
if
(
q
->
head_active
&&
!
q
->
plugged
)
head
=
head
->
next
;
head
=
head
->
next
;
entry
=
head
;
while
((
entry
=
entry
->
prev
)
!=
head
)
{
while
((
entry
=
entry
->
prev
)
!=
head
)
{
*
req
=
blkdev_entry_to_request
(
entry
);
*
req
=
blkdev_entry_to_request
(
entry
);
if
(
!
(
*
req
)
->
elevator_sequence
)
if
(
!
(
*
req
)
->
elevator_sequence
)
...
...
drivers/block/ll_rw_blk.c
View file @
a2c3c74c
...
@@ -709,16 +709,12 @@ static inline void __make_request(request_queue_t * q, int rw,
...
@@ -709,16 +709,12 @@ static inline void __make_request(request_queue_t * q, int rw,
req
=
__get_request_wait
(
q
,
rw
);
req
=
__get_request_wait
(
q
,
rw
);
spin_lock_irq
(
&
io_request_lock
);
spin_lock_irq
(
&
io_request_lock
);
}
/*
* revalidate elevator, queue request_lock was dropped
*/
head
=
&
q
->
queue_head
;
head
=
&
q
->
queue_head
;
if
(
q
->
head_active
&&
!
q
->
plugged
)
if
(
q
->
head_active
&&
!
q
->
plugged
)
head
=
head
->
next
;
head
=
head
->
next
;
}
/* fill up the request-info, and add it to the queue */
/* fill up the request-info, and add it to the queue */
req
->
cmd
=
rw
;
req
->
cmd
=
rw
;
req
->
errors
=
0
;
req
->
errors
=
0
;
...
...
include/asm-i386/io_apic.h
View file @
a2c3c74c
...
@@ -136,7 +136,7 @@ extern void IO_APIC_init_uniprocessor (void);
...
@@ -136,7 +136,7 @@ extern void IO_APIC_init_uniprocessor (void);
* If we use the IO-APIC for IRQ routing, disable automatic
* If we use the IO-APIC for IRQ routing, disable automatic
* assignment of PCI IRQ's.
* assignment of PCI IRQ's.
*/
*/
#define io_apic_assign_pci_irqs (
!mp_irq_entries
)
#define io_apic_assign_pci_irqs (
mp_irq_entries != 0
)
#else
/* !CONFIG_X86_IO_APIC */
#else
/* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0
#define io_apic_assign_pci_irqs 0
...
...
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