Attachment #224919 for bug #301515

View | Details | Raw Unified | Return to bug 301515
Collapse All | Expand All

Lines 233-238 case $system in Link Here

(-)a/acinclude.m4 (+3 lines)
233	if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then	233	if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then
234	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $[]2 }'\|tail -n 1`	234	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $[]2 }'\|tail -n 1`
235	LINUX_VERSION="$linux_kvers"	235	LINUX_VERSION="$linux_kvers"
		236	elif test -f "$LINUX_KERNEL_BUILD/include/generated/utsrelease.h"; then
		237	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/generated/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $[]2 }'\|tail -n 1`
		238	LINUX_VERSION="$linux_kvers"
236	else	239	else
237	if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then	240	if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then
238	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h \|awk 'BEGIN { FS="\"" } { print $[]2 }'\|tail -n 1`	241	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h \|awk 'BEGIN { FS="\"" } { print $[]2 }'\|tail -n 1`

Lines 5323-5328 $as_echo "#define ENABLE_REDHAT_BUILDSYS 1" >>confdefs.h Link Here

(-)a/configure (+3 lines)
5323	if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then	5323	if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then
5324	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $2 }'\|tail -n 1`	5324	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $2 }'\|tail -n 1`
5325	LINUX_VERSION="$linux_kvers"	5325	LINUX_VERSION="$linux_kvers"
		5326	elif test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then
		5327	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h \|awk 'BEGIN { FS="\"" } { print $2 }'\|tail -n 1`
		5328	LINUX_VERSION="$linux_kvers"
5326	else	5329	else
5327	if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then	5330	if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then
5328	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h \|awk 'BEGIN { FS="\"" } { print $2 }'\|tail -n 1`	5331	linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h \|awk 'BEGIN { FS="\"" } { print $2 }'\|tail -n 1`





static ctl_table afs_sysctl_table[] = {
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name 	= 1, 
#endif
	.procname 	= "hm_retry_RO",
	.data 		= &hm_retry_RO, 
	.maxlen		= sizeof(afs_int32), 

	.proc_handler	= &proc_dointvec
    },
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
        .ctl_name 	= 2, 
#endif
        .procname 	= "hm_retry_RW",
        .data		= &hm_retry_RW,
	.maxlen		= sizeof(afs_int32), 

     	.proc_handler	= &proc_dointvec
    },
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name	= 3, 
#endif
	.procname	= "hm_retry_int",
	.data		= &hm_retry_int, 
	.maxlen		= sizeof(afs_int32), 

	.proc_handler	= &proc_dointvec
    },
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name	= 4, 
#endif
	.procname	= "GCPAGs",
	.data		= &afs_gcpags, 
	.maxlen		= sizeof(afs_int32), 

	.proc_handler 	= &proc_dointvec
    },
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name	= 5, 
#endif
	.procname	= "rx_deadtime",
	.data		= &afs_rx_deadtime, 
	.maxlen		= sizeof(afs_int32), 

	.proc_handler	= &proc_dointvec
    },
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name	= 6, 
#endif
	.procname	= "bkVolPref",
	.data		= &afs_bkvolpref, 
	.maxlen		= sizeof(afs_int32), 


static ctl_table fs_sysctl_table[] = {
    {
#if defined(SYSCTL_TABLE_CHECKING)
	.ctl_name 	= CTL_UNNUMBERED, 
#else
	.ctl_name	= 1, 
#endif
	.procname	= "afs", 
	.mode		= 0555, 
	.child		= afs_sysctl_table

Return to bug 301515

Lines 28-38 static struct ctl_table_header *afs_sysctl = NULL; Link Here

(-)a/src/afs/LINUX/osi_sysctl.c (-35 lines)
28		28
29	static ctl_table afs_sysctl_table[] = {	29	static ctl_table afs_sysctl_table[] = {
30	{	30	{
31	#if defined(SYSCTL_TABLE_CHECKING)
32	.ctl_name = CTL_UNNUMBERED,
33	#else
34	.ctl_name = 1,
35	#endif
36	.procname = "hm_retry_RO",	31	.procname = "hm_retry_RO",
37	.data = &hm_retry_RO,	32	.data = &hm_retry_RO,
38	.maxlen = sizeof(afs_int32),	33	.maxlen = sizeof(afs_int32),
Lines 40-50 static ctl_table afs_sysctl_table[] = { Link Here
40	.proc_handler = &proc_dointvec	35	.proc_handler = &proc_dointvec
41	},	36	},
42	{	37	{
43	#if defined(SYSCTL_TABLE_CHECKING)
44	.ctl_name = CTL_UNNUMBERED,
45	#else
46	.ctl_name = 2,
47	#endif
48	.procname = "hm_retry_RW",	38	.procname = "hm_retry_RW",
49	.data = &hm_retry_RW,	39	.data = &hm_retry_RW,
50	.maxlen = sizeof(afs_int32),	40	.maxlen = sizeof(afs_int32),
Lines 52-62 static ctl_table afs_sysctl_table[] = { Link Here
52	.proc_handler = &proc_dointvec	42	.proc_handler = &proc_dointvec
53	},	43	},
54	{	44	{
55	#if defined(SYSCTL_TABLE_CHECKING)
56	.ctl_name = CTL_UNNUMBERED,
57	#else
58	.ctl_name = 3,
59	#endif
60	.procname = "hm_retry_int",	45	.procname = "hm_retry_int",
61	.data = &hm_retry_int,	46	.data = &hm_retry_int,
62	.maxlen = sizeof(afs_int32),	47	.maxlen = sizeof(afs_int32),
Lines 64-74 static ctl_table afs_sysctl_table[] = { Link Here
64	.proc_handler = &proc_dointvec	49	.proc_handler = &proc_dointvec
65	},	50	},
66	{	51	{
67	#if defined(SYSCTL_TABLE_CHECKING)
68	.ctl_name = CTL_UNNUMBERED,
69	#else
70	.ctl_name = 4,
71	#endif
72	.procname = "GCPAGs",	52	.procname = "GCPAGs",
73	.data = &afs_gcpags,	53	.data = &afs_gcpags,
74	.maxlen = sizeof(afs_int32),	54	.maxlen = sizeof(afs_int32),
Lines 76-86 static ctl_table afs_sysctl_table[] = { Link Here
76	.proc_handler = &proc_dointvec	56	.proc_handler = &proc_dointvec
77	},	57	},
78	{	58	{
79	#if defined(SYSCTL_TABLE_CHECKING)
80	.ctl_name = CTL_UNNUMBERED,
81	#else
82	.ctl_name = 5,
83	#endif
84	.procname = "rx_deadtime",	59	.procname = "rx_deadtime",
85	.data = &afs_rx_deadtime,	60	.data = &afs_rx_deadtime,
86	.maxlen = sizeof(afs_int32),	61	.maxlen = sizeof(afs_int32),
Lines 88-98 static ctl_table afs_sysctl_table[] = { Link Here
88	.proc_handler = &proc_dointvec	63	.proc_handler = &proc_dointvec
89	},	64	},
90	{	65	{
91	#if defined(SYSCTL_TABLE_CHECKING)
92	.ctl_name = CTL_UNNUMBERED,
93	#else
94	.ctl_name = 6,
95	#endif
96	.procname = "bkVolPref",	66	.procname = "bkVolPref",
97	.data = &afs_bkvolpref,	67	.data = &afs_bkvolpref,
98	.maxlen = sizeof(afs_int32),	68	.maxlen = sizeof(afs_int32),
Lines 104-114 static ctl_table afs_sysctl_table[] = { Link Here
104		74
105	static ctl_table fs_sysctl_table[] = {	75	static ctl_table fs_sysctl_table[] = {
106	{	76	{
107	#if defined(SYSCTL_TABLE_CHECKING)
108	.ctl_name = CTL_UNNUMBERED,
109	#else
110	.ctl_name = 1,
111	#endif
112	.procname = "afs",	77	.procname = "afs",
113	.mode = 0555,	78	.mode = 0555,
114	.child = afs_sysctl_table	79	.child = afs_sysctl_table