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
047d0b01
Commit
047d0b01
authored
Dec 04, 2002
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge redhat.com:/home/jgarzik/repo/linus-2.5
into redhat.com:/home/jgarzik/repo/exitp-2.5
parents
2becf2fd
35c8838f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
drivers/net/tulip/de2104x.c
drivers/net/tulip/de2104x.c
+1
-2
include/linux/init.h
include/linux/init.h
+12
-1
No files found.
drivers/net/tulip/de2104x.c
View file @
047d0b01
...
...
@@ -2217,8 +2217,7 @@ static struct pci_driver de_driver = {
.
name
=
DRV_NAME
,
.
id_table
=
de_pci_tbl
,
.
probe
=
de_init_one
,
#warning only here to fix build. should be __exit_p not __devexit_p.
.
remove
=
__devexit_p
(
de_remove_one
),
.
remove
=
__exit_p
(
de_remove_one
),
#ifdef CONFIG_PM
.
suspend
=
de_suspend
,
.
resume
=
de_resume
,
...
...
include/linux/init.h
View file @
047d0b01
...
...
@@ -42,10 +42,15 @@
discard it in modules) */
#define __init __attribute__ ((__section__ (".init.text")))
#define __initdata __attribute__ ((__section__ (".init.data")))
#define __exit __attribute__ ((__section__(".exit.text")))
#define __exitdata __attribute__ ((__section__(".exit.data")))
#define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit")))
#ifdef MODULE
#define __exit __attribute__ ((__section__(".exit.text")))
#else
#define __exit __attribute__ ((unused,__section__(".exit.text")))
#endif
/* For assembly routines */
#define __INIT .section ".init.text","ax"
#define __FINIT .previous
...
...
@@ -185,4 +190,10 @@ extern struct kernel_param __setup_start, __setup_end;
#define __devexit_p(x) NULL
#endif
#ifdef MODULE
#define __exit_p(x) x
#else
#define __exit_p(x) NULL
#endif
#endif
/* _LINUX_INIT_H */
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