dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

This commit is contained in:
Linus Torvalds 2005-11-11 16:29:22 -08:00
parent 85837ebdd7 b2d1a8adc9
commit 63f45b8094
14 changed files with 20 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/early-userspace/README
View File

@ -28,7 +28,7 @@ the image from specifications.
CPIO ARCHIVE method
You can create a cpio archive that contains the early userspace image.
Youre 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.

1
MAINTAINERS
View File

@ -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

8
drivers/block/floppy.c
View File

@ -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>

1
drivers/char/ftape/lowlevel/ftape-buffer.c
View File

@ -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.
*/

1
fs/afs/callback.c
View File

@ -19,6 +19,7 @@
#include "server.h"
#include "vnode.h"
#include "internal.h"
#include "cmservice.h"
/*****************************************************************************/
/*

117
fs/befs/attribute.c
View File

@ -1,117 +0,0 @@
/*
* 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)
{
}

1
fs/freevxfs/vxfs_bmap.c
View File

@ -36,6 +36,7 @@
#include "vxfs.h"
#include "vxfs_inode.h"
#include "vxfs_extern.h"
#ifdef DIAGNOSTIC

1
fs/freevxfs/vxfs_olt.c
View File

@ -36,6 +36,7 @@
#include "vxfs.h"
#include "vxfs_olt.h"
#include "vxfs_extern.h"
static inline void

1
fs/ioprio.c
View File

@ -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)
{

1
fs/jffs/jffs_fm.c
View File

@ -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);

1
fs/partitions/ultrix.c
View File

@ -7,6 +7,7 @@
*/
#include "check.h"
#include "ultrix.h"
int ultrix_partition(struct parsed_partitions *state, struct block_device *bdev)
{

1
fs/reiserfs/hashes.c
View File

@ -19,6 +19,7 @@
//
#include <linux/kernel.h>
#include <linux/reiserfs_fs.h>
#include <asm/types.h>
#include <asm/bug.h>

6
include/linux/idr.h
View File

@ -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__ */

2
mm/slab.c
View File

@ -434,7 +434,7 @@ struct kmem_cache {
/* Optimization question: fewer reaps means less
* probability for unnessary cpucache drain/refill cycles.
*
* OTHO the cpuarrays can contain lots of objects,
* OTOH the cpuarrays can contain lots of objects,
* which could lock up otherwise freeable slabs.
*/
#define REAPTIMEOUT_CPUC (2*HZ)