diff options
| author | Andy Grover <agrover@groveronline.com> | 2002-08-15 21:40:42 -0700 |
|---|---|---|
| committer | Andy Grover <agrover@acpi3.jf.intel.com> | 2002-08-15 21:40:42 -0700 |
| commit | 19d4344e7a70a5348cd7094f39e322e9b1fe4c31 (patch) | |
| tree | 0cc8121e89ccc9ebb39db30cf3460a66f49ff0d9 /include | |
| parent | 674c07190c8dc79ffc01fffa1171e31586d1b68c (diff) | |
| parent | c2480c8594056dc37b56c202433519c544d1519e (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/isdn.h | 2 | ||||
| -rw-r--r-- | include/linux/mm.h | 9 | ||||
| -rw-r--r-- | include/linux/sched.h | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 9544c782d17d..213d2cbc24f4 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -317,6 +317,7 @@ typedef struct isdn_net_local_s { /* 0 = Transparent */ int huptimer; /* Timeout-counter for auto-hangup */ int charge; /* Counter for charging units */ + int charge_state; /* ChargeInfo state machine */ ulong chargetime; /* Timer for Charging info */ int hupflags; /* Flags for charge-unit-hangup: */ /* bit0: chargeint is invalid */ @@ -329,6 +330,7 @@ typedef struct isdn_net_local_s { int onum; /* Flag: at least 1 outgoing number */ int cps; /* current speed of this interface */ int transcount; /* byte-counter for cps-calculation */ + int last_jiffies; /* when transcount was reset */ int sqfull; /* Flag: netdev-queue overloaded */ ulong sqfull_stamp; /* Start-Time of overload */ ulong slavedelay; /* Dynamic bundling delaytime */ diff --git a/include/linux/mm.h b/include/linux/mm.h index 4d7de397481f..c4395b9fe950 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -199,11 +199,12 @@ struct page { #define page_count(p) atomic_read(&(p)->count) #define set_page_count(p,v) atomic_set(&(p)->count, v) extern void FASTCALL(__page_cache_release(struct page *)); -#define put_page(p) \ - do { \ - if (put_page_testzero(p)) \ - __page_cache_release(p); \ +#define put_page(p) \ + do { \ + if (!PageReserved(p) && put_page_testzero(p)) \ + __page_cache_release(p); \ } while (0) +void FASTCALL(__free_pages_ok(struct page *page, unsigned int order)); /* * Multiple processes may "see" the same page. E.g. for untouched diff --git a/include/linux/sched.h b/include/linux/sched.h index 767d1b7bd0ec..5713927c300a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -47,8 +47,8 @@ struct exec_domain; #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ #define CLONE_SETTID 0x00100000 /* write the TID back to userspace */ -#define CLONE_DETACHED 0x00200000 /* parent wants no child-exit signal */ -#define CLONE_RELEASE_VM 0x00400000 /* release the userspace VM */ +#define CLONE_CLEARTID 0x00200000 /* clear the userspace TID */ +#define CLONE_DETACHED 0x00400000 /* parent wants no child-exit signal */ #define CLONE_SIGNAL (CLONE_SIGHAND | CLONE_THREAD) @@ -307,7 +307,7 @@ struct task_struct { wait_queue_head_t wait_chldexit; /* for wait4() */ struct completion *vfork_done; /* for vfork() */ - long *user_vm_lock; /* for CLONE_RELEASE_VM */ + long *user_tid; /* for CLONE_CLEARTID */ unsigned long rt_priority; unsigned long it_real_value, it_prof_value, it_virt_value; |