← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334

« back to all changes in this revision

Viewing changes to src/afs/LINUX/osi_sleep.c

  • Committer: Bazaar Package Importer
  • Author(s): Russ Allbery
  • Date: 2008-09-22 19:07:02 UTC
  • mfrom: (12.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080922190702-59m13d7kn6gkw32d
Tags: 1.4.7.dfsg1-6
http://bugs.debian.org/493914
https://launchpad.net/bugs/267504
http://bugs.debian.org/493120
* Apply upstream patch to free /proc entries in the correct order.
  Thanks, Marc Dionne.  (Closes: #493914)
* Apply upstream deltas to support 2.6.27 kernels and to stop using
  COMMON_KERN_CFLAGS for all 2.6 kernels uniformly, which fixes
  problems on amd64 with newer kernels.  Thanks, Björn Torkelsson.
  (LP: #267504)
* Translation updates:
  - Swedish, thanks Martin Bagge.  (Closes: #493120)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/afs/LINUX/osi_sleep.c
11
11
#include "afs/param.h"
12
12
 
13
13
RCSID
14
 
    ("$Header: /cvs/openafs/src/afs/LINUX/osi_sleep.c,v 1.22.2.8 2005/09/19 03:41:31 shadow Exp $");
 
14
    ("$Header: /cvs/openafs/src/afs/LINUX/osi_sleep.c,v 1.22.2.11 2007/06/12 05:47:47 rra Exp $");
15
15
 
16
16
#include "afs/sysincludes.h"    /* Standard vendor system headers */
17
17
#include "afsincludes.h"        /* Afs-based standard headers */
18
18
#include "afs/afs_stats.h"      /* afs statistics */
19
19
 
 
20
#if defined(FREEZER_H_EXISTS)
 
21
#include <linux/freezer.h>
 
22
#endif
 
23
 
20
24
static int osi_TimedSleep(char *event, afs_int32 ams, int aintok);
21
25
 
22
26
static char waitV, dummyV;
198
202
#ifdef PF_FREEZE
199
203
            current->flags & PF_FREEZE
200
204
#else
 
205
#if defined(STRUCT_TASK_STRUCT_HAS_TODO)
201
206
            !current->todo
 
207
#else
 
208
#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
 
209
            test_ti_thread_flag(current->thread_info, TIF_FREEZE)
 
210
#else
 
211
            test_ti_thread_flag(task_thread_info(current), TIF_FREEZE)
 
212
#endif
 
213
#endif
202
214
#endif
203
215
            )
204
216
#ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
292
304
#ifdef PF_FREEZE
293
305
            current->flags & PF_FREEZE
294
306
#else
 
307
#if defined(STRUCT_TASK_STRUCT_HAS_TODO)
295
308
            !current->todo
 
309
#else
 
310
#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
 
311
            test_ti_thread_flag(current->thread_info, TIF_FREEZE)
 
312
#else
 
313
            test_ti_thread_flag(task_thread_info(current), TIF_FREEZE)
 
314
#endif
 
315
#endif
296
316
#endif
297
317
            )
298
318
#ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE