← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to sysdeps/unix/sysv/linux/sys/sysctl.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sysdeps/unix/sysv/linux/sys/sysctl.h
1
 
/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
1
/* Copyright (C) 1996, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
2
2
   This file is part of the GNU C Library.
3
3
 
4
4
   The GNU C Library is free software; you can redistribute it and/or
39
39
# define __user
40
40
# define __undef__LINUX_COMPILER_H
41
41
#endif
42
 
#ifndef  _UAPI_LINUX_KERNEL_H
43
 
# define _UAPI_LINUX_KERNEL_H
44
 
# define __undef_UAPI_LINUX_KERNEL_H
45
 
#endif
46
 
#ifndef _UAPI_LINUX_TYPES_H
47
 
# define _UAPI_LINUX_TYPES_H
48
 
# define __undef_UAPI_LINUX_TYPES_H
49
 
#endif
50
42
 
51
43
#include <linux/sysctl.h>
52
44
 
67
59
# undef __user
68
60
# undef __undef__LINUX_COMPILER_H
69
61
#endif
70
 
#ifdef  __undef_UAPI_LINUX_KERNEL_H
71
 
# undef _UAPI_LINUX_KERNEL_H
72
 
# undef __undef_UAPI_LINUX_KERNEL_H
73
 
#endif
74
 
#ifdef __undef_UAPI_LINUX_TYPES_H
75
 
# undef _UAPI_LINUX_TYPES_H
76
 
# undef __undef_UAPI_LINUX_TYPES_H
77
 
#endif
78
62
 
79
63
#include <bits/sysctl.h>
80
64