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
dc5fd700
Commit
dc5fd700
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.4.0-test1
parent
f3453549
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
64 additions
and
37 deletions
+64
-37
Documentation/fb/modedb.txt
Documentation/fb/modedb.txt
+14
-2
arch/i386/Makefile
arch/i386/Makefile
+4
-0
arch/i386/config.in
arch/i386/config.in
+13
-13
arch/i386/defconfig
arch/i386/defconfig
+1
-1
arch/i386/kernel/cpuid.c
arch/i386/kernel/cpuid.c
+2
-2
arch/i386/kernel/msr.c
arch/i386/kernel/msr.c
+2
-2
drivers/video/fbmem.c
drivers/video/fbmem.c
+3
-3
fs/ncpfs/file.c
fs/ncpfs/file.c
+10
-0
fs/ncpfs/ioctl.c
fs/ncpfs/ioctl.c
+13
-13
fs/nfsd/nfsfh.c
fs/nfsd/nfsfh.c
+1
-1
include/asm-i386/sigcontext.h
include/asm-i386/sigcontext.h
+1
-0
No files found.
Documentation/fb/modedb.txt
View file @
dc5fd700
...
@@ -41,8 +41,20 @@ fb_find_mode() first tries the specified video mode (or any mode that matches,
...
@@ -41,8 +41,20 @@ fb_find_mode() first tries the specified video mode (or any mode that matches,
e.g. there can be multiple 640x480 modes, each of them is tried). If that
e.g. there can be multiple 640x480 modes, each of them is tried). If that
fails, the default mode is tried. If that fails, it walks over all modes.
fails, the default mode is tried. If that fails, it walks over all modes.
BTW, only a few drivers use this at the moment. Others are to follow
To specify a video mode at bootup, use the following boot options:
(feel free to send patches).
video=<driver>:<xres>x<yres>[-<bpp>][@refresh]
where <driver> is a name from the table below. Valid default modes can be
found in linux/drivers/video/modedb.c. Check your driver's documentation.
There may be more modes.
Drivers that support modedb boot options
Boot Name Cards Supported
ami - Amiga chipset frame buffer
aty128fb - ATI Rage128 / Pro frame buffer
atyfb - ATI Mach64 frame buffer
tdfx - 3D Fx frame buffer
BTW, only a few drivers use this at the moment. Others are to follow
(feel free to send patches).
arch/i386/Makefile
View file @
dc5fd700
...
@@ -49,6 +49,10 @@ ifdef CONFIG_M686
...
@@ -49,6 +49,10 @@ ifdef CONFIG_M686
CFLAGS
+=
$(
shell
if
$(CC)
-march
=
i686
-S
-o
/dev/null
-xc
/dev/null
>
/dev/null 2>&1
;
then
echo
"-march=i686"
;
fi
)
CFLAGS
+=
$(
shell
if
$(CC)
-march
=
i686
-S
-o
/dev/null
-xc
/dev/null
>
/dev/null 2>&1
;
then
echo
"-march=i686"
;
fi
)
endif
endif
ifdef
CONFIG_M686FX
CFLAGS
+=
$(
shell
if
$(CC)
-march
=
i686
-S
-o
/dev/null
-xc
/dev/null
>
/dev/null 2>&1
;
then
echo
"-march=i686"
;
fi
)
endif
ifdef
CONFIG_MK6
ifdef
CONFIG_MK6
CFLAGS
+=
$(
shell
if
$(CC)
-march
=
k6
-S
-o
/dev/null
-xc
/dev/null
>
/dev/null 2>&1
;
then
echo
"-march=k6"
;
fi
)
CFLAGS
+=
$(
shell
if
$(CC)
-march
=
k6
-S
-o
/dev/null
-xc
/dev/null
>
/dev/null 2>&1
;
then
echo
"-march=k6"
;
fi
)
endif
endif
...
...
arch/i386/config.in
View file @
dc5fd700
...
@@ -22,11 +22,11 @@ choice 'Processor family' \
...
@@ -22,11 +22,11 @@ choice 'Processor family' \
486/Cx486 CONFIG_M486 \
486/Cx486 CONFIG_M486 \
586/K5/5x86/6x86/6x86MX CONFIG_M586 \
586/K5/5x86/6x86/6x86MX CONFIG_M586 \
Pentium/TSC CONFIG_M586TSC \
Pentium/TSC CONFIG_M586TSC \
PPro/P
-II/P-III
CONFIG_M686 \
PPro/P
entium-II
CONFIG_M686 \
Pentium-III CONFIG_M686FX \
Pentium-III CONFIG_M686FX \
K6/
II/
III CONFIG_MK6 \
K6/
K6-II/K6-
III CONFIG_MK6 \
Crusoe CONFIG_MCRUSOE
\
Athlon CONFIG_MK7
\
Athlon CONFIG_MK7
" PPro
Crusoe CONFIG_MCRUSOE
" PPro
#
#
# Define implied options from the CPU selection here
# Define implied options from the CPU selection here
#
#
...
@@ -55,10 +55,6 @@ if [ "$CONFIG_M586TSC" = "y" ]; then
...
@@ -55,10 +55,6 @@ if [ "$CONFIG_M586TSC" = "y" ]; then
define_bool CONFIG_X86_ALIGNMENT_16 y
define_bool CONFIG_X86_ALIGNMENT_16 y
define_bool CONFIG_X86_TSC y
define_bool CONFIG_X86_TSC y
fi
fi
if [ "$CONFIG_MCRUSOE" = "y" ]; then
define_int CONFIG_X86_L1_CACHE_BYTES 32
define_bool CONFIG_X86_TSC y
fi
if [ "$CONFIG_M686" = "y" ]; then
if [ "$CONFIG_M686" = "y" ]; then
define_int CONFIG_X86_L1_CACHE_BYTES 32
define_int CONFIG_X86_L1_CACHE_BYTES 32
define_bool CONFIG_X86_TSC y
define_bool CONFIG_X86_TSC y
...
@@ -88,6 +84,10 @@ if [ "$CONFIG_MK7" = "y" ]; then
...
@@ -88,6 +84,10 @@ if [ "$CONFIG_MK7" = "y" ]; then
define_bool CONFIG_X86_PGE y
define_bool CONFIG_X86_PGE y
define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
define_bool CONFIG_X86_USE_PPRO_CHECKSUM y
fi
fi
if [ "$CONFIG_MCRUSOE" = "y" ]; then
define_int CONFIG_X86_L1_CACHE_BYTES 32
define_bool CONFIG_X86_TSC y
fi
tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE
tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE
tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR
...
...
arch/i386/defconfig
View file @
dc5fd700
...
@@ -21,8 +21,8 @@ CONFIG_UID16=y
...
@@ -21,8 +21,8 @@ CONFIG_UID16=y
CONFIG_M686=y
CONFIG_M686=y
# CONFIG_M686FX is not set
# CONFIG_M686FX is not set
# CONFIG_MK6 is not set
# CONFIG_MK6 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MK7 is not set
# CONFIG_MK7 is not set
# CONFIG_MCRUSOE is not set
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_INVLPG=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_CMPXCHG=y
...
...
arch/i386/kernel/cpuid.c
View file @
dc5fd700
...
@@ -71,14 +71,14 @@ extern inline void do_cpuid(int cpu, u32 reg, u32 *data)
...
@@ -71,14 +71,14 @@ extern inline void do_cpuid(int cpu, u32 reg, u32 *data)
smp_call_function
(
cpuid_smp_cpuid
,
(
void
*
)
cmd
,
1
,
1
);
smp_call_function
(
cpuid_smp_cpuid
,
(
void
*
)
cmd
,
1
,
1
);
}
}
}
}
#else
/* !
__SMP__
*/
#else
/* !
CONFIG_SMP
*/
extern
inline
void
do_cpuid
(
int
cpu
,
u32
reg
,
u32
*
data
)
extern
inline
void
do_cpuid
(
int
cpu
,
u32
reg
,
u32
*
data
)
{
{
cpuid
(
reg
,
&
data
[
0
],
&
data
[
1
],
&
data
[
2
],
&
data
[
3
]);
cpuid
(
reg
,
&
data
[
0
],
&
data
[
1
],
&
data
[
2
],
&
data
[
3
]);
}
}
#endif
/* !
__SMP__
*/
#endif
/* !
CONFIG_SMP
*/
static
loff_t
cpuid_seek
(
struct
file
*
file
,
loff_t
offset
,
int
orig
)
static
loff_t
cpuid_seek
(
struct
file
*
file
,
loff_t
offset
,
int
orig
)
{
{
...
...
arch/i386/kernel/msr.c
View file @
dc5fd700
...
@@ -143,7 +143,7 @@ extern inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
...
@@ -143,7 +143,7 @@ extern inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
}
}
}
}
#else
/* !
__SMP__
*/
#else
/* !
CONFIG_SMP
*/
extern
inline
int
do_wrmsr
(
int
cpu
,
u32
reg
,
u32
eax
,
u32
edx
)
extern
inline
int
do_wrmsr
(
int
cpu
,
u32
reg
,
u32
eax
,
u32
edx
)
{
{
...
@@ -155,7 +155,7 @@ extern inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
...
@@ -155,7 +155,7 @@ extern inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
return
rdmsr_eio
(
reg
,
eax
,
edx
);
return
rdmsr_eio
(
reg
,
eax
,
edx
);
}
}
#endif
/* !
__SMP__
*/
#endif
/* !
CONFIG_SMP
*/
static
loff_t
msr_seek
(
struct
file
*
file
,
loff_t
offset
,
int
orig
)
static
loff_t
msr_seek
(
struct
file
*
file
,
loff_t
offset
,
int
orig
)
{
{
...
...
drivers/video/fbmem.c
View file @
dc5fd700
...
@@ -233,13 +233,13 @@ static struct {
...
@@ -233,13 +233,13 @@ static struct {
/* Not a real frame buffer device... */
/* Not a real frame buffer device... */
{
"resolver"
,
NULL
,
resolver_video_setup
},
{
"resolver"
,
NULL
,
resolver_video_setup
},
#endif
#endif
#ifdef CONFIG_FB_SIS
{
"sisfb"
,
sisfb_init
,
sisfb_setup
},
#endif
#ifdef CONFIG_FB_VIRTUAL
#ifdef CONFIG_FB_VIRTUAL
/* Must be last to avoid that vfb becomes your primary display */
/* Must be last to avoid that vfb becomes your primary display */
{
"vfb"
,
vfb_init
,
vfb_setup
},
{
"vfb"
,
vfb_init
,
vfb_setup
},
#endif
#endif
#ifdef CONFIG_FB_SIS
{
"sisfb"
,
sisfb_init
,
sisfb_setup
},
#endif
};
};
#define NUM_FB_DRIVERS (sizeof(fb_drivers)/sizeof(*fb_drivers))
#define NUM_FB_DRIVERS (sizeof(fb_drivers)/sizeof(*fb_drivers))
...
...
fs/ncpfs/file.c
View file @
dc5fd700
...
@@ -275,12 +275,22 @@ ncp_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
...
@@ -275,12 +275,22 @@ ncp_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
return
already_written
?
already_written
:
errno
;
return
already_written
?
already_written
:
errno
;
}
}
static
int
ncp_release
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
NCP_FINFO
(
inode
)
->
opened
)
{
if
(
ncp_make_closed
(
inode
))
{
DPRINTK
(
"ncp_release: failed to close
\n
"
);
}
}
return
0
;
}
struct
file_operations
ncp_file_operations
=
struct
file_operations
ncp_file_operations
=
{
{
read:
ncp_file_read
,
read:
ncp_file_read
,
write:
ncp_file_write
,
write:
ncp_file_write
,
ioctl:
ncp_ioctl
,
ioctl:
ncp_ioctl
,
mmap:
ncp_mmap
,
mmap:
ncp_mmap
,
release:
ncp_release
,
fsync:
ncp_fsync
,
fsync:
ncp_fsync
,
};
};
...
...
fs/ncpfs/ioctl.c
View file @
dc5fd700
...
@@ -250,10 +250,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
...
@@ -250,10 +250,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
{
{
return
-
EACCES
;
return
-
EACCES
;
}
}
if
(
server
->
sign_active
)
if
(
arg
)
{
{
return
-
EINVAL
;
}
if
(
server
->
sign_wanted
)
if
(
server
->
sign_wanted
)
{
{
struct
ncp_sign_init
sign
;
struct
ncp_sign_init
sign
;
...
@@ -265,6 +262,9 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
...
@@ -265,6 +262,9 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
server
->
sign_active
=
1
;
server
->
sign_active
=
1
;
}
}
/* ignore when signatures not wanted */
/* ignore when signatures not wanted */
}
else
{
server
->
sign_active
=
0
;
}
return
0
;
return
0
;
case
NCP_IOC_SIGN_WANTED
:
case
NCP_IOC_SIGN_WANTED
:
...
...
fs/nfsd/nfsfh.c
View file @
dc5fd700
...
@@ -812,8 +812,8 @@ fh_put(struct svc_fh *fhp)
...
@@ -812,8 +812,8 @@ fh_put(struct svc_fh *fhp)
{
{
struct
dentry
*
dentry
=
fhp
->
fh_dentry
;
struct
dentry
*
dentry
=
fhp
->
fh_dentry
;
if
(
fhp
->
fh_dverified
)
{
if
(
fhp
->
fh_dverified
)
{
fhp
->
fh_dentry
=
NULL
;
fh_unlock
(
fhp
);
fh_unlock
(
fhp
);
fhp
->
fh_dentry
=
NULL
;
fhp
->
fh_dverified
=
0
;
fhp
->
fh_dverified
=
0
;
dput
(
dentry
);
dput
(
dentry
);
nfsd_nr_put
++
;
nfsd_nr_put
++
;
...
...
include/asm-i386/sigcontext.h
View file @
dc5fd700
#ifndef _ASMi386_SIGCONTEXT_H
#ifndef _ASMi386_SIGCONTEXT_H
#define _ASMi386_SIGCONTEXT_H
#define _ASMi386_SIGCONTEXT_H
#include <linux/config.h>
/*
/*
* As documented in the iBCS2 standard..
* As documented in the iBCS2 standard..
*
*
...
...
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