Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
3c5d4de07c
commit
bffee47a5b
|
@ -3424,6 +3424,18 @@ CONFIG_NFSD_V3=y
|
|||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
CONFIG_NFS_FSCACHE=y
|
||||
# Enable pNFS
|
||||
CONFIG_PNFS=y
|
||||
CONFIG_PNFSD=y
|
||||
CONFIG_PNFSD_LOCAL_EXPORT=y
|
||||
CONFIG_SPNFS=y
|
||||
CONFIG_SPNFS_LAYOUTSEGMENTS=y
|
||||
CONFIG_SPNFS_BLOCK=y
|
||||
CONFIG_PNFS_OBJLAYOUT=m
|
||||
CONFIG_PNFS_BLOCK=m
|
||||
CONFIG_PNFS_PANLAYOUT=m
|
||||
CONFIG_PNFS_FILE_LAYOUT=m
|
||||
#
|
||||
CONFIG_LOCKD=m
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
|
|
14
kernel.spec
14
kernel.spec
|
@ -23,7 +23,7 @@ Summary: The Linux kernel
|
|||
#
|
||||
# (Uncomment the '#' and both spaces below to set the buildid.)
|
||||
#
|
||||
# % define buildid .local
|
||||
%define buildid .pnfs35.2010.08.19
|
||||
###################################################################
|
||||
|
||||
# The buildid can also be specified on the rpmbuild command line
|
||||
|
@ -107,7 +107,7 @@ Summary: The Linux kernel
|
|||
# kernel-headers
|
||||
%define with_headers %{?_without_headers: 0} %{?!_without_headers: 1}
|
||||
# kernel-firmware
|
||||
%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 0}
|
||||
%define with_firmware %{?_with_firmware: 1} %{?!_with_firmware: 1}
|
||||
# tools/perf
|
||||
%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1}
|
||||
# kernel-debuginfo
|
||||
|
@ -710,6 +710,10 @@ Patch12070: xfs-move-aio-completion-after-unwritten-extent-conversion.patch
|
|||
|
||||
Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
|
||||
|
||||
Patch13000: pnfs-all-2.6.35-2010-08-19.patch
|
||||
Patch13001: linux-2.6-pnfs-compile.patch
|
||||
Patch13002: linux-2.6.35-inline.patch
|
||||
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
|
@ -1310,6 +1314,10 @@ ApplyPatch xfs-move-aio-completion-after-unwritten-extent-conversion.patch
|
|||
# bz 610941
|
||||
ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
|
||||
|
||||
ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
|
||||
ApplyPatch linux-2.6-pnfs-compile.patch
|
||||
ApplyPatch linux-2.6.35-inline.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -1916,6 +1924,8 @@ fi
|
|||
- Drop merged patches:
|
||||
mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
|
||||
mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
|
||||
* Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
|
||||
- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
|
||||
|
||||
* Wed Aug 18 2010 Dave Jones <davej@redhat.com>
|
||||
- systemd is dependant upon autofs, so build it in instead of modular.
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff -up linux-2.6.32.x86_64/fs/nfs/objlayout/pnfs_osd_xdr.h.orig linux-2.6.32.x86_64/fs/nfs/objlayout/pnfs_osd_xdr.h
|
||||
diff -up linux-2.6.32.x86_64/include/net/inet_connection_sock.h.orig linux-2.6.32.x86_64/include/net/inet_connection_sock.h
|
||||
--- linux-2.6.32.x86_64/include/net/inet_connection_sock.h.orig 2009-12-02 22:51:21.000000000 -0500
|
||||
+++ linux-2.6.32.x86_64/include/net/inet_connection_sock.h 2010-04-21 14:26:24.475659551 -0400
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <net/inet_sock.h>
|
||||
#include <net/request_sock.h>
|
||||
|
||||
-#define INET_CSK_DEBUG 1
|
||||
+//#define INET_CSK_DEBUG 1
|
||||
|
||||
/* Cancel timers, when they are not required. */
|
||||
#undef INET_CSK_CLEAR_TIMERS
|
|
@ -0,0 +1,11 @@
|
|||
diff -up linux-2.6.34.noarch/arch/x86/Makefile.orig linux-2.6.34.noarch/arch/x86/Makefile
|
||||
--- linux-2.6.34.noarch/arch/x86/Makefile.orig 2010-07-01 13:33:21.859627499 -0400
|
||||
+++ linux-2.6.34.noarch/arch/x86/Makefile 2010-07-01 13:36:26.751576450 -0400
|
||||
@@ -81,6 +81,7 @@ ifdef CONFIG_CC_STACKPROTECTOR
|
||||
$(warning stack protector enabled but no compiler support)
|
||||
endif
|
||||
endif
|
||||
+KBUILD_CFLAGS += -fno-inline-functions-called-once
|
||||
|
||||
# Don't unroll struct assignments with kmemcheck enabled
|
||||
ifeq ($(CONFIG_KMEMCHECK),y)
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue