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
ecccde0f
Commit
ecccde0f
authored
Feb 27, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
d24385ea
52e3c71b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
22 deletions
+6
-22
arch/alpha/kernel/entry.S
arch/alpha/kernel/entry.S
+0
-4
arch/alpha/kernel/pci-noop.c
arch/alpha/kernel/pci-noop.c
+2
-1
arch/alpha/kernel/pci.c
arch/alpha/kernel/pci.c
+0
-13
include/asm-alpha/bitops.h
include/asm-alpha/bitops.h
+1
-1
include/asm-alpha/thread_info.h
include/asm-alpha/thread_info.h
+3
-3
No files found.
arch/alpha/kernel/entry.S
View file @
ecccde0f
...
...
@@ -591,7 +591,6 @@ alpha_switch_to:
*/
.
globl
ret_from_fork
#if CONFIG_SMP || CONFIG_PREEMPT
.
align
4
.
ent
ret_from_fork
ret_from_fork
:
...
...
@@ -599,9 +598,6 @@ ret_from_fork:
mov
$
17
,
$
16
jmp
$
31
,
schedule_tail
.
end
ret_from_fork
#else
ret_from_fork
=
ret_from_sys_call
#endif
/*
*
kernel_thread
(
fn
,
arg
,
clone_flags
)
...
...
arch/alpha/kernel/pci-noop.c
View file @
ecccde0f
...
...
@@ -48,7 +48,6 @@ asmlinkage long
sys_pciconfig_iobase
(
long
which
,
unsigned
long
bus
,
unsigned
long
dfn
)
{
struct
pci_controller
*
hose
;
struct
pci_dev
*
dev
;
/* from hose or from bus.devfn */
if
(
which
&
IOBASE_FROM_HOSE
)
{
...
...
@@ -106,6 +105,7 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
void
*
pci_alloc_consistent
(
struct
pci_dev
*
pdev
,
size_t
size
,
dma_addr_t
*
dma_addrp
)
{
return
NULL
;
}
void
pci_free_consistent
(
struct
pci_dev
*
pdev
,
size_t
size
,
void
*
cpu_addr
,
...
...
@@ -116,6 +116,7 @@ dma_addr_t
pci_map_single
(
struct
pci_dev
*
pdev
,
void
*
cpu_addr
,
size_t
size
,
int
direction
)
{
return
(
dma_addr_t
)
0
;
}
void
pci_unmap_single
(
struct
pci_dev
*
pdev
,
dma_addr_t
dma_addr
,
size_t
size
,
...
...
arch/alpha/kernel/pci.c
View file @
ecccde0f
...
...
@@ -62,17 +62,6 @@ quirk_isa_bridge(struct pci_dev *dev)
dev
->
class
=
PCI_CLASS_BRIDGE_ISA
<<
8
;
}
static
void
__init
quirk_ali_ide_ports
(
struct
pci_dev
*
dev
)
{
if
(
dev
->
resource
[
0
].
end
==
0xffff
)
dev
->
resource
[
0
].
end
=
dev
->
resource
[
0
].
start
+
7
;
if
(
dev
->
resource
[
2
].
end
==
0xffff
)
dev
->
resource
[
2
].
end
=
dev
->
resource
[
2
].
start
+
7
;
if
(
dev
->
resource
[
3
].
end
==
0xffff
)
dev
->
resource
[
3
].
end
=
dev
->
resource
[
3
].
start
+
7
;
}
static
void
__init
quirk_cypress
(
struct
pci_dev
*
dev
)
{
...
...
@@ -121,8 +110,6 @@ pcibios_fixup_final(struct pci_dev *dev)
struct
pci_fixup
pcibios_fixups
[]
__initdata
=
{
{
PCI_FIXUP_HEADER
,
PCI_VENDOR_ID_INTEL
,
PCI_DEVICE_ID_INTEL_82378
,
quirk_isa_bridge
},
{
PCI_FIXUP_HEADER
,
PCI_VENDOR_ID_AL
,
PCI_DEVICE_ID_AL_M5229
,
quirk_ali_ide_ports
},
{
PCI_FIXUP_HEADER
,
PCI_VENDOR_ID_CONTAQ
,
PCI_DEVICE_ID_CONTAQ_82C693
,
quirk_cypress
},
{
PCI_FIXUP_FINAL
,
PCI_ANY_ID
,
PCI_ANY_ID
,
...
...
include/asm-alpha/bitops.h
View file @
ecccde0f
...
...
@@ -288,7 +288,7 @@ static inline unsigned long __ffs(unsigned long word)
#else
unsigned
long
bits
,
qofs
,
bofs
;
bits
=
__kernel_cmpbge
(
word
,
0
);
bits
=
__kernel_cmpbge
(
0
,
word
);
qofs
=
ffz_b
(
bits
);
bits
=
__kernel_extbl
(
word
,
qofs
);
bofs
=
ffz_b
(
~
bits
);
...
...
include/asm-alpha/thread_info.h
View file @
ecccde0f
...
...
@@ -34,9 +34,9 @@ struct thread_info {
*/
#define INIT_THREAD_INFO(tsk) \
{ \
task:
&tsk, \
exec_domain:
&default_exec_domain, \
addr_limit:
KERNEL_DS, \
.task =
&tsk, \
.exec_domain =
&default_exec_domain, \
.addr_limit =
KERNEL_DS, \
.restart_block = { \
.fn = do_no_restart_syscall, \
}, \
...
...
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