Advertisement
Guest User

Untitled

a guest
Feb 4th, 2013
58
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.13 KB | None | 0 0
  1. --- ARCH/config.x86_64  2013-02-04 05:38:48.434742577 -0500
  2. +++ linux-ck/config.x86_64  2013-02-04 05:39:04.666448799 -0500
  3. @@ -1,6 +1,6 @@
  4.  #
  5.  # Automatically generated file; DO NOT EDIT.
  6. -# Linux/x86_64 3.7.1-1 Kernel Configuration
  7. +# Linux/x86_64 3.7.5-2 Kernel Configuration
  8.  #
  9.  CONFIG_64BIT=y
  10.  CONFIG_X86_64=y
  11. @@ -49,11 +49,12 @@
  12.  #
  13.  # General setup
  14.  #
  15. +CONFIG_SCHED_BFS=y
  16.  CONFIG_EXPERIMENTAL=y
  17.  CONFIG_INIT_ENV_ARG_LIMIT=32
  18.  CONFIG_CROSS_COMPILE=""
  19. -CONFIG_LOCALVERSION="-ARCH"
  20. -CONFIG_LOCALVERSION_AUTO=y
  21. +CONFIG_LOCALVERSION="-ck"
  22. +# CONFIG_LOCALVERSION_AUTO is not set
  23.  CONFIG_HAVE_KERNEL_GZIP=y
  24.  CONFIG_HAVE_KERNEL_BZIP2=y
  25.  CONFIG_HAVE_KERNEL_LZMA=y
  26. @@ -109,7 +110,7 @@
  27.  # CPU/Task time and stats accounting
  28.  #
  29.  CONFIG_TICK_CPU_ACCOUNTING=y
  30. -# CONFIG_IRQ_TIME_ACCOUNTING is not set
  31. +CONFIG_IRQ_TIME_ACCOUNTING=y
  32.  CONFIG_BSD_PROCESS_ACCT=y
  33.  CONFIG_BSD_PROCESS_ACCT_V3=y
  34.  CONFIG_TASKSTATS=y
  35. @@ -139,7 +140,6 @@
  36.  CONFIG_CGROUP_DEVICE=y
  37.  CONFIG_CPUSETS=y
  38.  CONFIG_PROC_PID_CPUSET=y
  39. -CONFIG_CGROUP_CPUACCT=y
  40.  CONFIG_RESOURCE_COUNTERS=y
  41.  CONFIG_MEMCG=y
  42.  CONFIG_MEMCG_SWAP=y
  43. @@ -147,10 +147,6 @@
  44.  CONFIG_MEMCG_KMEM=y
  45.  # CONFIG_CGROUP_HUGETLB is not set
  46.  # CONFIG_CGROUP_PERF is not set
  47. -CONFIG_CGROUP_SCHED=y
  48. -CONFIG_FAIR_GROUP_SCHED=y
  49. -CONFIG_CFS_BANDWIDTH=y
  50. -CONFIG_RT_GROUP_SCHED=y
  51.  CONFIG_BLK_CGROUP=y
  52.  # CONFIG_DEBUG_BLK_CGROUP is not set
  53.  # CONFIG_CHECKPOINT_RESTORE is not set
  54. @@ -159,7 +155,6 @@
  55.  CONFIG_IPC_NS=y
  56.  CONFIG_PID_NS=y
  57.  CONFIG_NET_NS=y
  58. -CONFIG_SCHED_AUTOGROUP=y
  59.  CONFIG_MM_OWNER=y
  60.  # CONFIG_SYSFS_DEPRECATED is not set
  61.  CONFIG_RELAY=y
  62. @@ -206,7 +201,6 @@
  63.  CONFIG_PCI_QUIRKS=y
  64.  CONFIG_SLUB_DEBUG=y
  65.  # CONFIG_COMPAT_BRK is not set
  66. -# CONFIG_SLAB is not set
  67.  CONFIG_SLUB=y
  68.  CONFIG_PROFILING=y
  69.  CONFIG_TRACEPOINTS=y
  70. @@ -458,9 +452,16 @@
  71.  CONFIG_SECCOMP=y
  72.  CONFIG_CC_STACKPROTECTOR=y
  73.  # CONFIG_HZ_100 is not set
  74. -# CONFIG_HZ_250 is not set
  75. +# CONFIG_HZ_250_NODEFAULT is not set
  76.  CONFIG_HZ_300=y
  77.  # CONFIG_HZ_1000 is not set
  78. +# CONFIG_HZ_1500 is not set
  79. +# CONFIG_HZ_2000 is not set
  80. +# CONFIG_HZ_3000 is not set
  81. +# CONFIG_HZ_4000 is not set
  82. +# CONFIG_HZ_5000 is not set
  83. +# CONFIG_HZ_7500 is not set
  84. +# CONFIG_HZ_10000 is not set
  85.  CONFIG_HZ=300
  86.  CONFIG_SCHED_HRTICK=y
  87.  CONFIG_KEXEC=y
  88. @@ -4919,8 +4920,7 @@
  89.  CONFIG_DX_SEP=m
  90.  CONFIG_ZRAM=m
  91.  # CONFIG_ZRAM_DEBUG is not set
  92. -# CONFIG_ZCACHE is not setup
  93. -CONFIG_ZCACHE2=y
  94. +# CONFIG_ZCACHE is not set
  95.  CONFIG_ZSMALLOC=y
  96.  CONFIG_WLAGS49_H2=m
  97.  CONFIG_WLAGS49_H25=m
  98. @@ -5000,6 +5000,8 @@
  99.  # CONFIG_WIMAX_GDM72XX_SDIO is not set
  100.  CONFIG_WIMAX_GDM72XX_USB_PM=y
  101.  CONFIG_CSR_WIFI=m
  102. +CONFIG_ZCACHE2=y
  103. +CONFIG_RAMSTER=y
  104.  CONFIG_NET_VENDOR_SILICOM=y
  105.  CONFIG_SBYPASS=m
  106.  CONFIG_BPCTL=m
  107. @@ -5219,7 +5221,6 @@
  108.  CONFIG_HUGETLBFS=y
  109.  CONFIG_HUGETLB_PAGE=y
  110.  CONFIG_CONFIGFS_FS=y
  111. -CONFIG_RAMSTER=y
  112.  CONFIG_MISC_FILESYSTEMS=y
  113.  # CONFIG_ADFS_FS is not set
  114.  CONFIG_AFFS_FS=m
  115. @@ -5453,7 +5454,6 @@
  116.  CONFIG_ARCH_WANT_FRAME_POINTERS=y
  117.  CONFIG_FRAME_POINTER=y
  118.  # CONFIG_BOOT_PRINTK_DELAY is not set
  119. -# CONFIG_RCU_TORTURE_TEST is not set
  120.  CONFIG_RCU_CPU_STALL_TIMEOUT=60
  121.  # CONFIG_RCU_CPU_STALL_VERBOSE is not set
  122.  # CONFIG_RCU_CPU_STALL_INFO is not set
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement