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
fd60595ce9
commit
c7b01347fb
|
@ -3322,6 +3322,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
|
||||
|
|
15
kernel.spec
15
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 .pnfs_all_2.6.35_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_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1}
|
||||
# perf noarch subpkg
|
||||
|
@ -766,6 +766,12 @@ Patch12460: xfs-move-aio-completion-after-unwritten-extent-conversion.patch
|
|||
Patch12470: drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch
|
||||
Patch12480: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
|
||||
|
||||
Patch30000: nfs-35-fc.patch
|
||||
Patch30001: nfsd-35-fc.patch
|
||||
Patch30002: pnfs-all-2.6.35-2010-08-19-f13.patch
|
||||
Patch30003: linux-2.6-pnfs-compile.patch
|
||||
Patch30004: linux-2.6.35-inline.patch
|
||||
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
|
@ -1424,6 +1430,11 @@ ApplyPatch drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch
|
|||
# bz #610941
|
||||
ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
|
||||
|
||||
ApplyPatch nfs-35-fc.patch
|
||||
ApplyPatch nfsd-35-fc.patch
|
||||
ApplyPatch pnfs-all-2.6.35-2010-08-19-f13.patch
|
||||
ApplyPatch linux-2.6-pnfs-compile.patch
|
||||
ApplyPatch linux-2.6.35-inline.patch
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
|
@ -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
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue