diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-09-08 19:19:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-09-08 19:19:04 -0700 |
| commit | 6ad814c17b10b3d229e67e45fd6eaf5ecbc7d253 (patch) | |
| tree | 4f9bd448e1ee4ad56918ee4f024c419aec13d543 /include/linux | |
| parent | 2233e8ecdbcf6f731ffee1b66e94b35bb94f227a (diff) | |
| parent | c9581bb63607e96645f0066865464a80413a1248 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/gregkh-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 1 | ||||
| -rw-r--r-- | include/linux/threads.h | 3 |
5 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 66fa638d2ff2..f67b149a06ee 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -368,7 +368,7 @@ struct inode { atomic_t i_count; dev_t i_dev; umode_t i_mode; - nlink_t i_nlink; + unsigned int i_nlink; uid_t i_uid; gid_t i_gid; kdev_t i_rdev; diff --git a/include/linux/ide.h b/include/linux/ide.h index aacdaad8f594..98a2db1db397 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -464,7 +464,6 @@ typedef struct ide_drive_s { byte nice1; /* flag: give potential excess bandwidth */ unsigned present : 1; /* drive is physically present */ unsigned noprobe : 1; /* from: hdx=noprobe */ - unsigned busy : 1; /* currently doing revalidate_disk() */ unsigned removable : 1; /* 1 if need to do check_media_change */ unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ unsigned no_unmask : 1; /* disallow setting unmask bit */ @@ -506,7 +505,6 @@ typedef struct ide_drive_s { unsigned long long capacity48; /* total number of sectors */ unsigned int drive_data; /* for use by tuneproc/selectproc as needed */ struct hwif_s *hwif; /* actually (ide_hwif_t *) */ - wait_queue_head_t wqueue; /* used to wait for drive in open() */ struct hd_driveid *id; /* drive model identification info */ struct hd_struct *part; /* drive partition table */ char name[4]; /* drive name, such as "hda" */ diff --git a/include/linux/sched.h b/include/linux/sched.h index c5c828d52897..896b7f59941c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -455,7 +455,7 @@ extern struct task_struct init_task; extern struct mm_struct init_mm; /* PID hashing. (shouldnt this be dynamic?) */ -#define PIDHASH_SZ (4096 >> 2) +#define PIDHASH_SZ 8192 extern struct task_struct *pidhash[PIDHASH_SZ]; #define pid_hashfn(x) ((((x) >> 8) ^ (x)) & (PIDHASH_SZ - 1)) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 4c598d745e2e..4856854660cc 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -127,6 +127,7 @@ enum KERN_CORE_USES_PID=52, /* int: use core or core.%pid */ KERN_TAINTED=53, /* int: various kernel tainted flags */ KERN_CADPID=54, /* int: PID of the process to notify on CAD */ + KERN_PIDMAX=55, /* int: PID # limit */ }; diff --git a/include/linux/threads.h b/include/linux/threads.h index 6804ee73640f..8e0ddb960524 100644 --- a/include/linux/threads.h +++ b/include/linux/threads.h @@ -19,7 +19,6 @@ /* * This controls the maximum pid allocated to a process */ -#define PID_MASK 0x3fffffff -#define PID_MAX (PID_MASK+1) +#define DEFAULT_PID_MAX 0x8000 #endif |