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
nexedi
linux
Commits
3970d19e
Commit
3970d19e
authored
Feb 07, 2003
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Plain Diff
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/sfr
parents
518a829f
7d5bea38
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
143 additions
and
134 deletions
+143
-134
arch/i386/kernel/edd.c
arch/i386/kernel/edd.c
+139
-131
arch/i386/kernel/setup.c
arch/i386/kernel/setup.c
+1
-1
include/asm-i386/edd.h
include/asm-i386/edd.h
+1
-1
include/linux/seqlock.h
include/linux/seqlock.h
+2
-1
No files found.
arch/i386/kernel/edd.c
View file @
3970d19e
This diff is collapsed.
Click to expand it.
arch/i386/kernel/setup.c
View file @
3970d19e
...
...
@@ -474,7 +474,7 @@ static int __init copy_e820_map(struct e820entry * biosmap, int nr_map)
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
unsigned
char
eddnr
;
struct
edd_info
edd
[
EDDNR
];
struct
edd_info
edd
[
EDD
MAX
NR
];
/**
* copy_edd() - Copy the BIOS EDD information
* from empty_zero_page into a safe place.
...
...
include/asm-i386/edd.h
View file @
3970d19e
...
...
@@ -165,7 +165,7 @@ struct edd_info {
struct
edd_device_params
params
;
}
__attribute__
((
packed
));
extern
struct
edd_info
edd
[
EDDNR
];
extern
struct
edd_info
edd
[
EDD
MAX
NR
];
extern
unsigned
char
eddnr
;
#endif
/*!__ASSEMBLY__ */
...
...
include/linux/seqlock.h
View file @
3970d19e
...
...
@@ -115,7 +115,8 @@ static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
({ local_irq_save(flags); read_seqbegin(lock); })
#define read_seqretry_irqrestore(lock, iv, flags) \
({int ret = read_seqretry(&(lock)->seq, iv); \
({ \
int ret = read_seqretry(lock, iv); \
local_irq_restore(flags); \
ret; \
})
...
...
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