Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
63f45b80
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
63f45b80
编写于
11月 11, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
上级
85837ebd
b2d1a8ad
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
20 addition
and
124 deletion
+20
-124
Documentation/early-userspace/README
Documentation/early-userspace/README
+1
-1
MAINTAINERS
MAINTAINERS
+0
-1
drivers/block/floppy.c
drivers/block/floppy.c
+4
-4
drivers/char/ftape/lowlevel/ftape-buffer.c
drivers/char/ftape/lowlevel/ftape-buffer.c
+1
-0
fs/afs/callback.c
fs/afs/callback.c
+1
-0
fs/befs/attribute.c
fs/befs/attribute.c
+0
-117
fs/freevxfs/vxfs_bmap.c
fs/freevxfs/vxfs_bmap.c
+1
-0
fs/freevxfs/vxfs_olt.c
fs/freevxfs/vxfs_olt.c
+1
-0
fs/ioprio.c
fs/ioprio.c
+1
-0
fs/jffs/jffs_fm.c
fs/jffs/jffs_fm.c
+1
-0
fs/partitions/ultrix.c
fs/partitions/ultrix.c
+1
-0
fs/reiserfs/hashes.c
fs/reiserfs/hashes.c
+1
-0
include/linux/idr.h
include/linux/idr.h
+6
-0
mm/slab.c
mm/slab.c
+1
-1
未找到文件。
Documentation/early-userspace/README
浏览文件 @
63f45b80
...
...
@@ -28,7 +28,7 @@ the image from specifications.
CPIO ARCHIVE method
You can create a cpio archive that contains the early userspace image.
Your
e
cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
will be used directly. Only a single cpio file may be specified in
CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in
combination with a cpio archive.
...
...
MAINTAINERS
浏览文件 @
63f45b80
...
...
@@ -1988,7 +1988,6 @@ PKTCDVD DRIVER
P: Peter Osterlund
M: petero2@telia.com
L: linux-kernel@vger.kernel.org
L: packet-writing@suse.com
S: Maintained
POSIX CLOCKS and TIMERS
...
...
drivers/block/floppy.c
浏览文件 @
63f45b80
...
...
@@ -97,6 +97,10 @@
* features to asm/floppy.h.
*/
/*
* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
*/
/*
* 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
* interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
...
...
@@ -158,10 +162,6 @@ static int print_unex = 1;
#define FDPATCHES
#include <linux/fdreg.h>
/*
* 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
*/
#include <linux/fd.h>
#include <linux/hdreg.h>
...
...
drivers/char/ftape/lowlevel/ftape-buffer.c
浏览文件 @
63f45b80
...
...
@@ -33,6 +33,7 @@
#include "../lowlevel/ftape-rw.h"
#include "../lowlevel/ftape-read.h"
#include "../lowlevel/ftape-tracing.h"
#include "../lowlevel/ftape-buffer.h"
/* DMA'able memory allocation stuff.
*/
...
...
fs/afs/callback.c
浏览文件 @
63f45b80
...
...
@@ -19,6 +19,7 @@
#include "server.h"
#include "vnode.h"
#include "internal.h"
#include "cmservice.h"
/*****************************************************************************/
/*
...
...
fs/befs/attribute.c
已删除
100644 → 0
浏览文件 @
85837ebd
/*
* linux/fs/befs/attribute.c
*
* Copyright (C) 2002 Will Dyson <will_dyson@pobox.com>
*
* Many thanks to Dominic Giampaolo, author of "Practical File System
* Design with the Be File System", for such a helpful book.
*
*/
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include "befs.h"
#include "endian.h"
#define SD_DATA(sd)\
(void*)((char*)sd + sizeof(*sd) + (sd->name_size - sizeof(sd->name)))
#define SD_NEXT(sd)\
(befs_small_data*)((char*)sd + sizeof(*sd) + (sd->name_size - \
sizeof(sd->name) + sd->data_size))
int
list_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
,
filldir_t
filldir
);
befs_small_data
*
find_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
,
const
char
*
name
);
int
read_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
,
befs_small_data
*
sdata
,
void
*
buf
,
size_t
bufsize
);
/**
*
*
*
*
*
*/
befs_small_data
*
find_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
,
const
char
*
name
)
{
befs_small_data
*
sdata
=
inode
->
small_data
;
while
(
sdata
->
type
!=
0
)
{
if
(
strcmp
(
name
,
sdata
->
name
)
!=
0
)
{
return
sdata
;
}
sdata
=
SD_NEXT
(
sdata
);
}
return
NULL
;
}
/**
*
*
*
*
*
*/
int
read_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
,
const
char
*
name
,
void
*
buf
,
size_t
bufsize
)
{
befs_small_data
*
sdata
;
sdata
=
find_small_data
(
sb
,
inode
,
name
);
if
(
sdata
==
NULL
)
return
BEFS_ERR
;
else
if
(
sdata
->
data_size
>
bufsize
)
return
BEFS_ERR
;
memcpy
(
buf
,
SD_DATA
(
sdata
),
sdata
->
data_size
);
return
BEFS_OK
;
}
/**
*
*
*
*
*
*/
int
list_small_data
(
struct
super_block
*
sb
,
befs_inode
*
inode
)
{
}
/**
*
*
*
*
*
*/
int
list_attr
(
struct
super_block
*
sb
,
befs_inode
*
inode
)
{
}
/**
*
*
*
*
*
*/
int
read_attr
(
struct
super_block
*
sb
,
befs_inode
*
inode
)
{
}
fs/freevxfs/vxfs_bmap.c
浏览文件 @
63f45b80
...
...
@@ -36,6 +36,7 @@
#include "vxfs.h"
#include "vxfs_inode.h"
#include "vxfs_extern.h"
#ifdef DIAGNOSTIC
...
...
fs/freevxfs/vxfs_olt.c
浏览文件 @
63f45b80
...
...
@@ -36,6 +36,7 @@
#include "vxfs.h"
#include "vxfs_olt.h"
#include "vxfs_extern.h"
static
inline
void
...
...
fs/ioprio.c
浏览文件 @
63f45b80
...
...
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/ioprio.h>
#include <linux/blkdev.h>
#include <linux/syscalls.h>
static
int
set_task_ioprio
(
struct
task_struct
*
task
,
int
ioprio
)
{
...
...
fs/jffs/jffs_fm.c
浏览文件 @
63f45b80
...
...
@@ -20,6 +20,7 @@
#include <linux/blkdev.h>
#include <linux/jffs.h>
#include "jffs_fm.h"
#include "intrep.h"
#if defined(JFFS_MARK_OBSOLETE) && JFFS_MARK_OBSOLETE
static
int
jffs_mark_obsolete
(
struct
jffs_fmcontrol
*
fmc
,
__u32
fm_offset
);
...
...
fs/partitions/ultrix.c
浏览文件 @
63f45b80
...
...
@@ -7,6 +7,7 @@
*/
#include "check.h"
#include "ultrix.h"
int
ultrix_partition
(
struct
parsed_partitions
*
state
,
struct
block_device
*
bdev
)
{
...
...
fs/reiserfs/hashes.c
浏览文件 @
63f45b80
...
...
@@ -19,6 +19,7 @@
//
#include <linux/kernel.h>
#include <linux/reiserfs_fs.h>
#include <asm/types.h>
#include <asm/bug.h>
...
...
include/linux/idr.h
浏览文件 @
63f45b80
...
...
@@ -8,6 +8,10 @@
* Small id to pointer translation service avoiding fixed sized
* tables.
*/
#ifndef __IDR_H__
#define __IDR_H__
#include <linux/types.h>
#include <linux/bitops.h>
...
...
@@ -77,3 +81,5 @@ int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
void
idr_remove
(
struct
idr
*
idp
,
int
id
);
void
idr_destroy
(
struct
idr
*
idp
);
void
idr_init
(
struct
idr
*
idp
);
#endif
/* __IDR_H__ */
mm/slab.c
浏览文件 @
63f45b80
...
...
@@ -434,7 +434,7 @@ struct kmem_cache {
/* Optimization question: fewer reaps means less
* probability for unnessary cpucache drain/refill cycles.
*
* OT
HO
the cpuarrays can contain lots of objects,
* OT
OH
the cpuarrays can contain lots of objects,
* which could lock up otherwise freeable slabs.
*/
#define REAPTIMEOUT_CPUC (2*HZ)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录