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
6eeee43b
Commit
6eeee43b
authored
Sep 26, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://ppc.bkbits.net/for-linus-ppc
into home.osdl.org:/home/torvalds/v2.5/linux
parents
5817032e
e28f8379
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
11 deletions
+15
-11
drivers/md/multipath.c
drivers/md/multipath.c
+1
-1
include/linux/init.h
include/linux/init.h
+14
-10
No files found.
drivers/md/multipath.c
View file @
6eeee43b
...
...
@@ -178,7 +178,7 @@ static int multipath_make_request (request_queue_t *q, struct bio * bio)
mp_bh
->
bio
=
*
bio
;
mp_bh
->
bio
.
bi_bdev
=
multipath
->
rdev
->
bdev
;
mp_bh
->
bio
.
bi_
flags
|=
(
1
<<
BIO_RW_FAILFAST
);
mp_bh
->
bio
.
bi_
rw
|=
(
1
<<
BIO_RW_FAILFAST
);
mp_bh
->
bio
.
bi_end_io
=
multipath_end_request
;
mp_bh
->
bio
.
bi_private
=
mp_bh
;
generic_make_request
(
&
mp_bh
->
bio
);
...
...
include/linux/init.h
View file @
6eeee43b
...
...
@@ -43,12 +43,12 @@
#define __init __attribute__ ((__section__ (".init.text")))
#define __initdata __attribute__ ((__section__ (".init.data")))
#define __exitdata __attribute__ ((__section__(".exit.data")))
#define __exit_call __attribute_
_ ((unused,
__section__ (".exitcall.exit")))
#define __exit_call __attribute_
used__ __attribute__ ((
__section__ (".exitcall.exit")))
#ifdef MODULE
#define __exit __attribute__ ((__section__(".exit.text")))
#else
#define __exit __attribute_
_ ((unused,
__section__(".exit.text")))
#define __exit __attribute_
used__ __attribute__ ((
__section__(".exit.text")))
#endif
/* For assembly routines */
...
...
@@ -79,7 +79,8 @@ extern initcall_t __security_initcall_start, __security_initcall_end;
*/
#define __define_initcall(level,fn) \
static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn
static initcall_t __initcall_##fn __attribute_used__ \
__attribute__((__section__(".initcall" level ".init"))) = fn
#define core_initcall(fn) __define_initcall("1",fn)
#define postcore_initcall(fn) __define_initcall("2",fn)
...
...
@@ -91,14 +92,16 @@ extern initcall_t __security_initcall_start, __security_initcall_end;
#define __initcall(fn) device_initcall(fn)
#define __exitcall(fn)
\
#define __exitcall(fn)
\
static exitcall_t __exitcall_##fn __exit_call = fn
#define console_initcall(fn) \
static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".con_initcall.init")))=fn
static initcall_t __initcall_##fn \
__attribute_used__ __attribute__((__section__(".con_initcall.init")))=fn
#define security_initcall(fn) \
static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".security_initcall.init"))) = fn
static initcall_t __initcall_##fn \
__attribute_used__ __attribute__((__section__(".security_initcall.init"))) = fn
struct
obs_kernel_param
{
const
char
*
str
;
...
...
@@ -106,10 +109,11 @@ struct obs_kernel_param {
};
/* OBSOLETE: see moduleparam.h for the right way. */
#define __setup(str, fn) \
static char __setup_str_##fn[] __initdata = str; \
static struct obs_kernel_param __setup_##fn \
__attribute__((unused,__section__ (".init.setup"))) \
#define __setup(str, fn) \
static char __setup_str_##fn[] __initdata = str; \
static struct obs_kernel_param __setup_##fn \
__attribute_used__ \
__attribute__((__section__(".init.setup"))) \
= { __setup_str_##fn, fn }
#endif
/* __ASSEMBLY__ */
...
...
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