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
79a54256
Commit
79a54256
authored
Feb 16, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
3e1d2624
98e9e854
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
scripts/Makefile
scripts/Makefile
+1
-1
scripts/Makefile.modinst
scripts/Makefile.modinst
+2
-2
scripts/modpost.c
scripts/modpost.c
+3
-1
No files found.
scripts/Makefile
View file @
79a54256
...
...
@@ -18,7 +18,7 @@ modpost-objs := modpost.o file2alias.o
subdir-
:=
lxdialog kconfig
# fixdep is needed to compile other host programs
$(addprefix $(obj)/,$(filter-out fixdep,$(
host-prog
s)))
:
$(obj)/fixdep
$(addprefix $(obj)/,$(filter-out fixdep,$(
build-target
s)))
:
$(obj)/fixdep
# dependencies on generated files need to be listed explicitly
...
...
scripts/Makefile.modinst
View file @
79a54256
...
...
@@ -9,7 +9,7 @@ include scripts/Makefile.lib
#
__modules
:=
$(
shell
c
d
$(MODVERDIR)
;
cat
*
.mod
)
__modules
:=
$(
shell
c
at
/dev/null
$(
wildcard
$(MODVERDIR)
/
*
.mod
)
)
modules
:=
$(
patsubst
%.o,%.ko,
$(
wildcard
$(__modules:.ko=.o)
))
ifneq
($(filter-out $(modules),$(__modules)),)
...
...
@@ -22,7 +22,7 @@ __modinst: $(modules)
# Modules built within the kernel tree
quiet_cmd_modules_install
=
INSTALL
$
(
obj-m:.o
=
.ko
)
quiet_cmd_modules_install
=
INSTALL
$
@
cmd_modules_install
=
mkdir
-p
$(MODLIB)
/kernel/
$
(
@D
)
;
\
cp
$@
$(MODLIB)
/kernel/
$
(
@D
)
...
...
scripts/modpost.c
View file @
79a54256
...
...
@@ -270,6 +270,7 @@ handle_modversions(struct module *mod, struct elf_info *info,
Elf_Sym
*
sym
,
const
char
*
symname
)
{
struct
symbol
*
s
;
unsigned
int
crc
;
switch
(
sym
->
st_shndx
)
{
case
SHN_COMMON
:
...
...
@@ -279,7 +280,8 @@ handle_modversions(struct module *mod, struct elf_info *info,
case
SHN_ABS
:
/* CRC'd symbol */
if
(
memcmp
(
symname
,
"__crc_"
,
6
)
==
0
)
{
add_exported_symbol
(
symname
+
6
,
mod
,
&
sym
->
st_value
);
crc
=
(
unsigned
int
)
sym
->
st_value
;
add_exported_symbol
(
symname
+
6
,
mod
,
&
crc
);
modversions
=
1
;
}
break
;
...
...
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