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
0cbd2c75
Commit
0cbd2c75
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.4.0-test3pre4
parent
bcc21526
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
10 deletions
+15
-10
arch/i386/kernel/process.c
arch/i386/kernel/process.c
+9
-2
drivers/block/rd.c
drivers/block/rd.c
+1
-1
fs/coda/dir.c
fs/coda/dir.c
+3
-2
fs/ext2/super.c
fs/ext2/super.c
+1
-1
fs/super.c
fs/super.c
+1
-4
No files found.
arch/i386/kernel/process.c
View file @
0cbd2c75
...
...
@@ -344,7 +344,7 @@ void machine_power_off(void)
void
show_regs
(
struct
pt_regs
*
regs
)
{
long
cr0
=
0L
,
cr2
=
0L
,
cr3
=
0L
;
unsigned
long
cr0
=
0L
,
cr2
=
0L
,
cr3
=
0L
,
cr4
=
0L
;
printk
(
"
\n
"
);
printk
(
"EIP: %04x:[<%08lx>]"
,
0xffff
&
regs
->
xcs
,
regs
->
eip
);
...
...
@@ -361,7 +361,14 @@ void show_regs(struct pt_regs * regs)
__asm__
(
"movl %%cr0, %0"
:
"=r"
(
cr0
));
__asm__
(
"movl %%cr2, %0"
:
"=r"
(
cr2
));
__asm__
(
"movl %%cr3, %0"
:
"=r"
(
cr3
));
printk
(
"CR0: %08lx CR2: %08lx CR3: %08lx
\n
"
,
cr0
,
cr2
,
cr3
);
/* This could fault if %cr4 does not exist */
__asm__
(
"1: movl %%cr4, %0
\n
"
"2:
\n
"
".section __ex_table,
\"
a
\"
\n
"
".long 1b,2b
\n
"
".previous
\n
"
:
"=r"
(
cr4
)
:
"0"
(
0
));
printk
(
"CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx
\n
"
,
cr0
,
cr2
,
cr3
,
cr4
);
}
/*
...
...
drivers/block/rd.c
View file @
0cbd2c75
...
...
@@ -436,8 +436,8 @@ int __init rd_init (void)
#ifdef MODULE
module_init
(
rd_init
);
#endif
module_exit
(
rd_cleanup
);
#endif
/* loadable module support */
MODULE_PARM
(
rd_size
,
"1i"
);
...
...
fs/coda/dir.c
View file @
0cbd2c75
...
...
@@ -15,9 +15,10 @@
#include <linux/stat.h>
#include <linux/errno.h>
#include <linux/locks.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <linux/string.h>
#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <linux/coda.h>
#include <linux/coda_linux.h>
...
...
fs/ext2/super.c
View file @
0cbd2c75
...
...
@@ -205,7 +205,7 @@ static int parse_options (char * options, unsigned long * sb_block,
else
if
(
!
strcmp
(
this_char
,
"resgid"
))
{
if
(
!
value
||
!*
value
)
{
printk
(
"EXT2-fs: the resgid option requires "
"an argument"
);
"an argument
\n
"
);
return
0
;
}
*
resgid
=
simple_strtoul
(
value
,
&
value
,
0
);
...
...
fs/super.c
View file @
0cbd2c75
...
...
@@ -1670,7 +1670,6 @@ asmlinkage long sys_pivot_root(const char *new_root, const char *put_old)
int
__init
change_root
(
kdev_t
new_root_dev
,
const
char
*
put_old
)
{
kdev_t
old_root_dev
=
ROOT_DEV
;
struct
vfsmount
*
old_rootmnt
;
struct
nameidata
devfs_nd
,
nd
;
int
error
=
0
;
...
...
@@ -1682,8 +1681,6 @@ int __init change_root(kdev_t new_root_dev,const char *put_old)
if
(
path_init
(
"/dev"
,
LOOKUP_FOLLOW
|
LOOKUP_POSITIVE
,
&
devfs_nd
))
error
=
path_walk
(
"/dev"
,
&
devfs_nd
);
if
(
!
error
)
{
struct
super_block
*
sb
=
devfs_nd
.
dentry
->
d_inode
->
i_sb
;
if
(
devfs_nd
.
mnt
->
mnt_sb
->
s_magic
==
DEVFS_SUPER_MAGIC
&&
devfs_nd
.
dentry
==
devfs_nd
.
mnt
->
mnt_root
)
{
dput
(
devfs_nd
.
dentry
);
...
...
@@ -1717,7 +1714,7 @@ int __init change_root(kdev_t new_root_dev,const char *put_old)
printk
(
"okay
\n
"
);
return
0
;
}
printk
(
KERN_ERR
"error %
l
d
\n
"
,
blivet
);
printk
(
KERN_ERR
"error %d
\n
"
,
blivet
);
return
error
;
}
/* FIXME: we should hold i_zombie on nd.dentry */
...
...
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