From: Aneesh Kumar <aneesh.kumar@gmail.com>
To: Andrew Morton <akpm@osdl.org>
Cc: rth@redhat.com, ink@jurassic.park.msu.ru, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Alpha print the symbol name in Oops
Date: Thu, 8 Jul 2004 14:46:17 +0530 [thread overview]
Message-ID: <cc723f5904070802165c127e62@mail.gmail.com> (raw)
In-Reply-To: <20040708001547.0fa78731.akpm@osdl.org>
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
On Thu, 8 Jul 2004 00:15:47 -0700, Andrew Morton <akpm@osdl.org> wrote:
> Aneesh Kumar <aneesh.kumar@gmail.com> wrote:
> >
> > + printk("[<%lx>]", tmp);
> > + print_symbol(" %s\n", tmp);
>
> print_symbol() does nothing at all if CONFIG_KALLSYMS=n. You probably want:
>
> printk("[<%lx>]", tmp);
> print_symbol(" %s", tmp);
> printk("\n");
>
Patch attached.
-aneesh
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ci.diff --]
[-- Type: text/x-patch; name="ci.diff", Size: 25574 bytes --]
Only in linux-2.6.6: .config
Only in linux-2.6.6: .config.old
Only in linux-2.6.6: .version
diff -ru5 linux-2.6.6-brian/Makefile linux-2.6.6/Makefile
--- linux-2.6.6-brian/Makefile 2004-06-25 19:58:16.000000000 +0530
+++ linux-2.6.6/Makefile 2004-07-02 13:48:19.000000000 +0530
@@ -436,22 +436,22 @@
# If .config needs to be updated, it will be done via the dependency
# that autoconf has on .config.
# To avoid any implicit rule to kick in, define an empty command
.config: ;
-#Add OpenSSI directory if CONFIG_CLUSTER
-cluster-$(CONFIG_CLUSTER) := cluster/
+
# If .config is newer than include/linux/autoconf.h, someone tinkered
# with it and forgot to run make oldconfig
include/linux/autoconf.h: .config
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
else
# Dummy target needed, because used as prerequisite
include/linux/autoconf.h: ;
endif
+
include $(srctree)/arch/$(ARCH)/Makefile
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
CFLAGS += -Os
else
@@ -485,12 +485,11 @@
MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
export MODLIB
ifeq ($(KBUILD_EXTMOD),)
-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/
-core-y += $(cluster-y)
+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ cluster/
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
$(net-y) $(net-m) $(libs-y) $(libs-m)))
@@ -634,13 +633,10 @@
endif
ifdef CONFIG_CLUSTER
# All OpenSSI cluster relation preparation of code goes here
#
-
-MRPROPER_FILES += include/cluster/arch include/cluster/gen/ics_proto_gen.h
-
preparecluster: clustersymlinks clustergen
clustersymlinks: include/cluster/arch
include/cluster/arch: $(srctree)/scripts/openssi/lnrel.sh
@@ -652,10 +648,11 @@
clustergen: include/cluster/gen/ics_proto_gen.h openssirpcgen
include/cluster/gen/ics_proto_gen.h: $(srctree)/scripts/openssi/type_template.awk
@echo ' Generating.... $@'
$(Q)if [ ! -d include/cluster/gen ]; then mkdir -p include/cluster/gen; fi;
+ $(Q)if [ ! -x /usr/bin/gawk ]; then echo "/usr/bin/gawk not found" ; exit 1; fi;
@gawk -f $(srctree)/scripts/openssi/type_template.awk \
$(srctree)/include/cluster/gen/ics_proto_gen.h.template \
$(srctree)/include/cluster/gen/ics_proto_gen.h.list >$@
openssirpcgen:
@@ -840,10 +837,13 @@
MRPROPER_DIRS += include/config include2
MRPROPER_FILES += .config .config.old include/asm .version \
include/linux/autoconf.h include/linux/version.h \
Module.symvers tags TAGS cscope*
+#OpenSSI files that need to be cleaned
+MRPROPER_FILES += include/cluster/arch include/cluster/gen/ics_proto_gen.h
+
# clean - Delete most, but leave enough to build external modules
#
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
clean-dirs := $(addprefix _clean_,$(vmlinux-alldirs))
diff -ru5 linux-2.6.6-brian/arch/alpha/kernel/entry.S linux-2.6.6/arch/alpha/kernel/entry.S
--- linux-2.6.6-brian/arch/alpha/kernel/entry.S 2004-06-26 11:23:47.000000000 +0530
+++ linux-2.6.6/arch/alpha/kernel/entry.S 2004-07-06 18:54:23.000000000 +0530
@@ -643,13 +643,13 @@
ldq $2, alpha_mv+HAE_CACHE
stq $2, 152($sp) /* HAE */
/* Shuffle FLAGS to the front; add CLONE_VM. */
#ifdef CONFIG_SSI
- ldi $1, CLONE_VM|CLONE_UNTRACED
+ ldi $1, KTHREAD_FLAGS | CLONE_UNTRACED
#else
- ldi $1, KTHREAD_FLAGS
+ ldi $1, CLONE_VM|CLONE_UNTRACED
#endif
or $18, $1, $16
bsr $26, sys_clone
/* We don't actually care for a3 success widgetry in the kernel.
@@ -708,11 +708,11 @@
/* Avoid the HAE being gratuitously wrong, to avoid restoring it. */
ldq $2, alpha_mv+HAE_CACHE
stq $2, 152($sp) /* HAE */
/* Shuffle FLAGS to the front */
- ldi $1, KTHREAD_FLAGS
+ ldi $1, KTHREAD_FLAGS | CLONE_UNTRACED
or $18, $1, $16
mov $31, $17 /* second argument = 0 */
mov $31, $18 /* third argument = 0 */
mov $31, $19 /* fourth argument = 0 */
mov $31, $20 /* fifth argument = 0 */
@@ -722,11 +722,12 @@
/* We don't actually care for a3 success widgetry in the kernel.
* Not for positive errno values.
*/
stq $0, 0($sp) /* $0 */
br restore_all
-.end kernel_thread
+.end kernel_thread_with_pid
+#endif
/*
* execve(path, argv, envp)
*/
.align 4
.globl execve
diff -ru5 linux-2.6.6-brian/arch/alpha/kernel/systbls.S linux-2.6.6/arch/alpha/kernel/systbls.S
--- linux-2.6.6-brian/arch/alpha/kernel/systbls.S 2004-05-10 08:02:52.000000000 +0530
+++ linux-2.6.6/arch/alpha/kernel/systbls.S 2004-07-06 16:39:53.000000000 +0530
@@ -455,10 +455,25 @@
.quad sys_mq_unlink
.quad sys_mq_timedsend
.quad sys_mq_timedreceive /* 435 */
.quad sys_mq_notify
.quad sys_mq_getsetattr
+#ifdef CONFIG_CLUSTER
+ .quad sys_ssisys /* 438 */
+#else
+ .quad alpha_ni_syscall
+#endif
+#ifdef CONFIG_SSI
+ .quad sys_rfork
+ .quad sys_rexecve
+ .quad sys_migrate /* 441 */
+#else
+ .quad alpha_ni_syscall
+ .quad alpha_ni_syscall
+ .quad alpha_ni_syscall
+#endif
+
.size sys_call_table, . - sys_call_table
.type sys_call_table, @object
/* Remember to update everything, kids. */
diff -ru5 linux-2.6.6-brian/arch/alpha/kernel/traps.c linux-2.6.6/arch/alpha/kernel/traps.c
--- linux-2.6.6-brian/arch/alpha/kernel/traps.c 2004-05-10 08:03:13.000000000 +0530
+++ linux-2.6.6/arch/alpha/kernel/traps.c 1916-06-01 23:47:26.000000000 +0553
@@ -14,10 +14,11 @@
#include <linux/tty.h>
#include <linux/delay.h>
#include <linux/smp_lock.h>
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/kallsyms.h>
#include <asm/gentrap.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
#include <asm/sysinfo.h>
@@ -117,20 +118,22 @@
static void
dik_show_trace(unsigned long *sp)
{
long i = 0;
- printk("Trace:");
+ printk("Trace:\n");
while (0x1ff8 & (unsigned long) sp) {
extern char _stext[], _etext[];
unsigned long tmp = *sp;
sp++;
if (tmp < (unsigned long) &_stext)
continue;
if (tmp >= (unsigned long) &_etext)
continue;
- printk("%lx%c", tmp, ' ');
+ //printk("%lx%c", tmp, ' ');
+ printk("[<%lx>]", tmp);
+ print_symbol(" %s\n", tmp);
if (i > 40) {
printk(" ...");
break;
}
}
diff -ru5 linux-2.6.6-brian/arch/i386/kernel/entry.S linux-2.6.6/arch/i386/kernel/entry.S
--- linux-2.6.6-brian/arch/i386/kernel/entry.S 2004-06-25 19:58:14.000000000 +0530
+++ linux-2.6.6/arch/i386/kernel/entry.S 2004-07-06 16:42:02.000000000 +0530
@@ -933,14 +933,20 @@
.long sys_mq_notify
.long sys_mq_getsetattr
# SSI_XXX: might need asmlinkage declaration in include/linux/syscalls.h
#ifdef CONFIG_CLUSTER
.long sys_ssisys
+#else
+ .long sys_ni_syscall
+#endif
#ifdef CONFIG_SSI
/* BEGIN SSI SYSTEM CALLS */
.long sys_rfork
.long sys_rexecve /* 285 */
.long sys_migrate
+#else
+ .long sys_ni_syscall
+ .long sys_ni_syscall
+ .long sys_ni_syscall
#endif /* CONFIG_SSI */
-#endif /* CONFIG_CLUSTER */
syscall_table_size=(.-sys_call_table)
diff -ru5 linux-2.6.6-brian/cluster/Kconfig linux-2.6.6/cluster/Kconfig
--- linux-2.6.6-brian/cluster/Kconfig 2004-06-25 19:58:14.000000000 +0530
+++ linux-2.6.6/cluster/Kconfig 2004-06-26 17:26:42.000000000 +0530
@@ -65,10 +65,18 @@
This value specifies how many "imalive" packets to send out per timeout
period.
The default is set to the value 3.
+config NODE_MONITOR_LOG_THRESHOLD
+ int "Node Monitor log threshold"
+ default 1
+ ---help---
+ FIXME!! write down what it is
+
+ The default is set to the value 1.
+
config CPID
bool "Clusterwide PIDs"
---help---
Saying Y here enables a clusterwide PID space.
diff -ru5 linux-2.6.6-brian/cluster/Makefile linux-2.6.6/cluster/Makefile
--- linux-2.6.6-brian/cluster/Makefile 2004-06-25 19:58:14.000000000 +0530
+++ linux-2.6.6/cluster/Makefile 2004-07-02 11:23:31.000000000 +0530
@@ -1,8 +1,6 @@
#
# Top level Makefile for the linux OpenSSI cluster implementation.
#
-obj-y :=
-obj-$(CONFIG_SSI) += ssi/
-obj-$(CONFIG_CLUSTER) += clms/ ics/ util/
-
+obj-$(CONFIG_CLUSTER) := clms/ ics/ util/
+#obj-$(CONFIG_SSI) += ssi/
diff -ru5 linux-2.6.6-brian/cluster/clms/Makefile linux-2.6.6/cluster/clms/Makefile
--- linux-2.6.6-brian/cluster/clms/Makefile 2004-06-26 11:23:47.000000000 +0530
+++ linux-2.6.6/cluster/clms/Makefile 2004-07-02 11:18:51.000000000 +0530
@@ -19,6 +19,5 @@
clean-files := icscli_clms_gen.c icssvr_clms_gen.c icssvr_clms_tables_gen.c
clean-files += ics_clms_macros_gen.h ics_clms_protos_gen.h
SVCFILES := clms.svc
-
diff -ru5 linux-2.6.6-brian/cluster/clms/clms_client.c linux-2.6.6/cluster/clms/clms_client.c
--- linux-2.6.6-brian/cluster/clms/clms_client.c 2004-06-25 19:58:14.000000000 +0530
+++ linux-2.6.6/cluster/clms/clms_client.c 2004-07-05 12:55:44.000000000 +0530
@@ -392,12 +392,12 @@
&key_servers,
&num_key_servers,
&key_icsinfo,
&num_key_servers_ics,
this_node,
- cpucount+1,
- cpucount+1,
+ num_possible_cpus(),
+ num_online_cpus(),
loops_per_jiffy,
num_physpages);
if ( (error) || (rval) ) {
panic("clms_client_join_cluster: rpc to clms master failed error %d rval %d\n", error, rval);
}
diff -ru5 linux-2.6.6-brian/cluster/clms/clms_master.c linux-2.6.6/cluster/clms/clms_master.c
--- linux-2.6.6-brian/cluster/clms/clms_master.c 2004-06-25 19:58:14.000000000 +0530
+++ linux-2.6.6/cluster/clms/clms_master.c 2004-07-05 12:56:21.000000000 +0530
@@ -73,12 +73,12 @@
void
clms_initialize_node_info(clusternode_t node)
{
- clms.clms_node_info[node].online_cpus =
- clms.clms_node_info[node].total_cpus = cpucount + 1;
+ clms.clms_node_info[node].online_cpus = num_online_cpus();
+ clms.clms_node_info[node].total_cpus = num_possible_cpus();
clms.clms_node_info[node].cpu_power = loops_per_jiffy;
clms.clms_node_info[node].total_memory = num_physpages;
}
/*
diff -ru5 linux-2.6.6-brian/cluster/ics/Makefile linux-2.6.6/cluster/ics/Makefile
--- linux-2.6.6-brian/cluster/ics/Makefile 2004-06-26 11:23:47.000000000 +0530
+++ linux-2.6.6/cluster/ics/Makefile 2004-07-02 11:19:01.000000000 +0530
@@ -13,9 +13,9 @@
$(obj)/ics_svr.o: $(obj)/ics_icssig_protos_gen.h
$(obj)/ics_svr_mgmt.o: $(obj)/ics_icssig_protos_gen.h
$(obj)/icssig_ics.o: $(obj)/ics_icssig_protos_gen.h $(obj)/icscli_icssig_gen.c $(obj)/icssvr_icssig_gen.c
clean-files := icscli_icssig_gen.c icssvr_icssig_gen.c icssvr_icssig_tables_gen.c
-clean-files := ics_icssig_macros_gen.h ics_icssig_protos_gen.h
+clean-files += ics_icssig_macros_gen.h ics_icssig_protos_gen.h
SVCFILES := icssig.svc
Only in linux-2.6.6/cluster/rpcgen: openssirpcgen
diff -ru5 linux-2.6.6-brian/cluster/util/Makefile linux-2.6.6/cluster/util/Makefile
--- linux-2.6.6-brian/cluster/util/Makefile 2004-06-26 11:23:47.000000000 +0530
+++ linux-2.6.6/cluster/util/Makefile 2004-06-26 17:41:12.000000000 +0530
@@ -4,12 +4,11 @@
#
#
obj-$(CONFIG_CLUSTER) := assert.o cluster_ksyms.o cluster_api_ics.o nsc_async.o nsc_daemon.o
-#obj-$(CONFIG_CLUSTER) += nsc_ics.o nsc_init.o nsc_log.o nsc_nodelist.o nsc_scalls.o nsc_xdr.o
-obj-$(CONFIG_CLUSTER) += nsc_init.o nsc_log.o nsc_nodelist.o
+obj-$(CONFIG_CLUSTER) += nsc_ics.o nsc_init.o nsc_log.o nsc_nodelist.o nsc_scalls.o nsc_xdr.o
obj-$(CONFIG_CLUSTER) += nsc_callback.o nsc_ndreg.o xdr_msghdr.o xdr.o assert.o node_monitor.o
$(obj)/cluster_api_ics.o: $(obj)/ics_cluster_api_protos_gen.h $(obj)/icscli_cluster_api_gen.c $(obj)/icssvr_cluster_api_gen.c
$(obj)/nsc_scalls..o: $(obj)/ics_cluster_api_protos_gen.h $(obj)/ics_cluster_api_macros_gen.h
diff -ru5 linux-2.6.6-brian/cluster/util/node_monitor.c linux-2.6.6/cluster/util/node_monitor.c
--- linux-2.6.6-brian/cluster/util/node_monitor.c 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/cluster/util/node_monitor.c 1916-06-02 02:05:00.000000000 +0553
@@ -128,12 +128,11 @@
/*
* Initialize Node Monitoring on Master node.
* reinit_flag is set if this is a CLMS secondary becoming the Master.
*/
-static void __init
-nm_do_init(void)
+static void nm_do_init(void)
{
int error;
struct nm_settings nm_settings;
INIT_EVENT(&nm_nodedown_event);
diff -ru5 linux-2.6.6-brian/cluster/util/nsc_ics.c linux-2.6.6/cluster/util/nsc_ics.c
--- linux-2.6.6-brian/cluster/util/nsc_ics.c 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/cluster/util/nsc_ics.c 2004-06-26 17:42:51.000000000 +0530
@@ -741,11 +741,11 @@
/*
* Using the given xdr routine encode the arguments into
* a msghdr.
*/
if (!icsxdr_encode_msghdr(&x, xargs, argsp, &margsp)) {
- ics_stat = RPC_CANTENCODEARGS;
+ ics_stat = CLUSTER_RPC_CANTENCODEARGS;
freemsghdr(margsp);
ICSXDRLOG(ICSXDR_DBG_RCALL,
"nsc_rcall: returning %d\n", ics_stat);
goto out;
}
@@ -782,11 +782,11 @@
/*
* Decode results and free the returned msghdr.
*/
ASSERT(mresp != NULL);
if (!icsxdr_decode_msghdr(&x, xresults, resultsp, mresp))
- ics_stat = RPC_CANTDECODERES;
+ ics_stat = CLUSTER_RPC_CANTDECODERES;
freemsghdr(mresp);
}
} else {
ics_stat = cli_icsnsc_rcall_msg(node,
svc,
@@ -857,11 +857,11 @@
* Decode any arguments and free the associated mblks.
*/
if (margsp) {
if (!icsxdr_decode_msghdr(xdrs, funcinfoptr->trpc_xargs,
argp, margsp)) {
- error = RPC_CANTDECODEARGS;
+ error = CLUSTER_RPC_CANTDECODEARGS;
freemsghdr(margsp);
goto out;
}
freemsghdr(margsp);
}
@@ -893,11 +893,11 @@
* if this fails.
*/
if (funcinfoptr->trpc_xresults != (xdrproc_t)xdr_void &&
!icsxdr_encode_msghdr(xdrs,funcinfoptr->trpc_xresults,
resp,mrespp)) {
- error = RPC_SYSTEMERROR;
+ error = CLUSTER_RPC_SYSTEMERROR;
freemsghdr(*mrespp);
*mrespp = NULL;
}
}
diff -ru5 linux-2.6.6-brian/cluster/util/nsc_scalls.c linux-2.6.6/cluster/util/nsc_scalls.c
--- linux-2.6.6-brian/cluster/util/nsc_scalls.c 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/cluster/util/nsc_scalls.c 2004-07-05 12:58:15.000000000 +0530
@@ -1148,11 +1148,11 @@
clusternode_info_t outargs;
clusternode_t node;
int error = 0;
int online = 0;
int cpus = 0;
- int status, i;
+ int status;
clms_api_state_t info;
int info_size;
if (uaddrin_len <= 0 ||
uaddrin_len > sizeof(inargs) ||
@@ -1193,20 +1193,13 @@
/*
* Get information about the CPU's
* This should be function ship to the specified node
*/
if (this_node == node) {
-#ifdef CONFIG_SMP
- for (i = 0; i < NR_CPUS; i++)
- if (cpu_online_map & (1UL << i))
- cpus++;
- online = cpucount + 1;
-#else /* CONFIG_SMP */
- cpus = online = 1;
-#endif /* CONFIG_SMP */
- }
- else {
+ cpus = num_possible_cpus();
+ online = num_online_cpus();
+ } else {
error = RCLUSTER_API_GETCPUINFO(node, &status,
this_node, &cpus, &online);
if (error == -EREMOTE) {
cpus = online = 0;
@@ -1370,23 +1363,12 @@
int *rval,
clusternode_t my_node,
int *num_cpus,
int *onlinecpus)
{
-#ifdef CONFIG_SMP
- int cpus = 0;
- int i;
-
- for (i = 0; i < NR_CPUS; i++)
- if (cpu_online_map & (1UL << i))
- cpus++;
- *num_cpus = cpus;
- *onlinecpus = cpucount + 1;
-#else /* CONFIG_SMP */
- *num_cpus = *onlinecpus = 1;
-#endif /* CONFIG_SMP */
-
+ *num_cpus = num_possible_cpus();
+ *onlinecpus = num_online_cpus();
return 0;
}
/*
* cluster_maxnodes()
diff -ru5 linux-2.6.6-brian/cluster/util/xdr.c linux-2.6.6/cluster/util/xdr.c
--- linux-2.6.6-brian/cluster/util/xdr.c 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/cluster/util/xdr.c 2004-06-26 17:20:32.000000000 +0530
@@ -88,11 +88,11 @@
#define LASTUNSIGNED ((u_int) 0-1)
/*
* for unit alignment
*/
-static const char xdr_zero[BYTES_PER_XDR_UNIT] = {0, 0, 0, 0};
+static const char xdrzero[BYTES_PER_XDR_UNIT] = {0, 0, 0, 0};
/*
* Free a data structure using XDR
* Not a filter, but a convenient utility nonetheless
*/
@@ -182,11 +182,11 @@
{
return FALSE;
}
if (rndup == 0)
return TRUE;
- return XDR_PUTBYTES (xdrs, xdr_zero, rndup);
+ return XDR_PUTBYTES (xdrs, xdrzero, rndup);
case XDR_FREE:
return TRUE;
}
return FALSE;
Only in linux-2.6.6/include: asm
diff -ru5 linux-2.6.6-brian/include/asm-i386/unistd.h linux-2.6.6/include/asm-i386/unistd.h
--- linux-2.6.6-brian/include/asm-i386/unistd.h 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/include/asm-i386/unistd.h 2004-07-06 16:42:28.000000000 +0530
@@ -297,19 +297,11 @@
#define __NR_ssisys 283
#define __NR_rfork 284
#define __NR_rexecve 285
#define __NR_migrate 286
-#ifdef CONFIG_CLUSTER
-#ifdef CONFIG_SSI
#define NR_syscalls 287
-#else
-#define NR_syscalls 284
-#endif
-#else
-#define NR_syscalls 283
-#endif
/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
#define __syscall_return(type, res) \
do { \
Only in linux-2.6.6/include/cluster: arch
diff -ru5 linux-2.6.6-brian/include/cluster/clms.h linux-2.6.6/include/cluster/clms.h
--- linux-2.6.6-brian/include/cluster/clms.h 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/include/cluster/clms.h 2004-07-05 12:38:20.000000000 +0530
@@ -41,16 +41,10 @@
#define CLMS_NODEDOWN_HALT 1
#define CLMS_NODEDOWN_DEBUG 2
#if defined(__KERNEL__)
-/* This may not work with the Voyager SMP architecture for x86, since it has
- * its own static definition of cpucount, but it's old so it probably
- * doesn't matter
- */
-extern int cpucount;
-
/*
* Interface to CLMS Subsystems
*/
#define CLMS_MAX_SUBSYSTEMS 15
typedef int clms_subsys_t;
Only in linux-2.6.6/include/cluster/gen: ics_proto_gen.h
diff -ru5 linux-2.6.6-brian/include/cluster/rpc/clnt.h linux-2.6.6/include/cluster/rpc/clnt.h
--- linux-2.6.6-brian/include/cluster/rpc/clnt.h 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/include/cluster/rpc/clnt.h 2004-06-26 17:13:17.000000000 +0530
@@ -48,56 +48,56 @@
* Rpc calls return an enum clnt_stat. This should be looked at more,
* since each implementation is required to live with this (implementation
* independent) list of errors.
*/
enum clnt_stat {
- RPC_SUCCESS=0, /* call succeeded */
+ CLUSTER_RPC_SUCCESS=0, /* call succeeded */
/*
* local errors
*/
- RPC_CANTENCODEARGS=1, /* can't encode arguments */
- RPC_CANTDECODERES=2, /* can't decode results */
- RPC_CANTSEND=3, /* failure in sending call */
- RPC_CANTRECV=4, /* failure in receiving result */
- RPC_TIMEDOUT=5, /* call timed out */
+ CLUSTER_RPC_CANTENCODEARGS=1, /* can't encode arguments */
+ CLUSTER_RPC_CANTDECODERES=2, /* can't decode results */
+ CLUSTER_RPC_CANTSEND=3, /* failure in sending call */
+ CLUSTER_RPC_CANTRECV=4, /* failure in receiving result */
+ CLUSTER_RPC_TIMEDOUT=5, /* call timed out */
/*
* remote errors
*/
- RPC_VERSMISMATCH=6, /* rpc versions not compatible */
- RPC_AUTHERROR=7, /* authentication error */
- RPC_PROGUNAVAIL=8, /* program not available */
- RPC_PROGVERSMISMATCH=9, /* program version mismatched */
- RPC_PROCUNAVAIL=10, /* procedure unavailable */
- RPC_CANTDECODEARGS=11, /* decode arguments error */
- RPC_SYSTEMERROR=12, /* generic "other problem" */
- RPC_NOBROADCAST = 21, /* Broadcasting not supported */
+ CLUSTER_RPC_VERSMISMATCH=6, /* rpc versions not compatible */
+ CLUSTER_RPC_AUTHERROR=7, /* authentication error */
+ CLUSTER_RPC_PROGUNAVAIL=8, /* program not available */
+ CLUSTER_RPC_PROGVERSMISMATCH=9, /* program version mismatched */
+ CLUSTER_RPC_PROCUNAVAIL=10, /* procedure unavailable */
+ CLUSTER_RPC_CANTDECODEARGS=11, /* decode arguments error */
+ CLUSTER_RPC_SYSTEMERROR=12, /* generic "other problem" */
+ CLUSTER_RPC_NOBROADCAST = 21, /* Broadcasting not supported */
/*
* callrpc & clnt_create errors
*/
- RPC_UNKNOWNHOST=13, /* unknown host name */
- RPC_UNKNOWNPROTO=17, /* unknown protocol */
- RPC_UNKNOWNADDR = 19, /* Remote address unknown */
+ CLUSTER_RPC_UNKNOWNHOST=13, /* unknown host name */
+ CLUSTER_RPC_UNKNOWNPROTO=17, /* unknown protocol */
+ CLUSTER_RPC_UNKNOWNADDR = 19, /* Remote address unknown */
/*
* rpcbind errors
*/
- RPC_RPCBFAILURE=14, /* portmapper failed in its call */
-#define RPC_PMAPFAILURE RPC_RPCBFAILURE
- RPC_PROGNOTREGISTERED=15, /* remote program is not registered */
- RPC_N2AXLATEFAILURE = 22, /* Name to addr translation failed */
+ CLUSTER_RPC_RPCBFAILURE=14, /* portmapper failed in its call */
+#define CLUSTER_RPC_PMAPFAILURE CLUSTER_RPC_RPCBFAILURE
+ CLUSTER_RPC_PROGNOTREGISTERED=15, /* remote program is not registered */
+ CLUSTER_RPC_N2AXLATEFAILURE = 22, /* Name to addr translation failed */
/*
* unspecified error
*/
- RPC_FAILED=16,
- RPC_INTR=18,
- RPC_TLIERROR=20,
- RPC_UDERROR=23,
+ CLUSTER_RPC_FAILED=16,
+ CLUSTER_RPC_INTR=18,
+ CLUSTER_RPC_TLIERROR=20,
+ CLUSTER_RPC_UDERROR=23,
/*
* asynchronous errors
*/
- RPC_INPROGRESS = 24,
- RPC_STALERACHANDLE = 25
+ CLUSTER_RPC_INPROGRESS = 24,
+ CLUSTER_RPC_STALERACHANDLE = 25
};
/*
* Error info.
@@ -390,11 +390,11 @@
/*
* If a creation fails, the following allows the user to figure out why.
*/
struct rpc_createerr {
enum clnt_stat cf_stat;
- struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
+ struct rpc_err cf_error; /* useful when cf_stat == CLUSTER_RPC_PMAPFAILURE */
};
extern struct rpc_createerr rpc_createerr;
diff -ru5 linux-2.6.6-brian/include/cluster/rpc/rpc_msg.h linux-2.6.6/include/cluster/rpc/rpc_msg.h
--- linux-2.6.6-brian/include/cluster/rpc/rpc_msg.h 2004-06-25 19:58:15.000000000 +0530
+++ linux-2.6.6/include/cluster/rpc/rpc_msg.h 2004-06-26 17:14:06.000000000 +0530
@@ -71,11 +71,11 @@
GARBAGE_ARGS=4,
SYSTEM_ERR=5
};
enum reject_stat {
- RPC_MISMATCH=0,
+ CLUSTER_RPC_MISMATCH=0,
AUTH_ERROR=1
};
/*
* Reply part of an rpc exchange
Only in linux-2.6.6/include: config
Only in linux-2.6.6/include/linux: autoconf.h
Only in linux-2.6.6/include/linux: version.h
diff -ru5 linux-2.6.6-brian/net/ipv4/tcp.c linux-2.6.6/net/ipv4/tcp.c
--- linux-2.6.6-brian/net/ipv4/tcp.c 2004-06-25 19:58:16.000000000 +0530
+++ linux-2.6.6/net/ipv4/tcp.c 2004-06-26 17:36:39.000000000 +0530
@@ -1813,11 +1813,11 @@
* There is no particular user process reading from this socket
* (we select an ICS daemon to process the packet) and we can
* assume urgent data is never sent on this stream.
*/
void ics_recvmsg(struct sock *sk, struct sk_buff *skb) {
- struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
+ struct tcp_opt *tp = tcp_sk(sk);
u32 adjust;
/*
* Handle retransmits which can back the sequence number up.
* and we must not reprocess the data.
Only in linux-2.6.6/scripts/basic: docproc
Only in linux-2.6.6/scripts/basic: fixdep
Only in linux-2.6.6/scripts/basic: split-include
Only in linux-2.6.6/scripts: bin2c
Only in linux-2.6.6/scripts: conmakehash
Only in linux-2.6.6/scripts: elfconfig.h
Only in linux-2.6.6/scripts/genksyms: genksyms
Only in linux-2.6.6/scripts/genksyms: keywords.c
Only in linux-2.6.6/scripts/genksyms: lex.c
Only in linux-2.6.6/scripts/genksyms: parse.c
Only in linux-2.6.6/scripts/genksyms: parse.h
Only in linux-2.6.6/scripts: kallsyms
Only in linux-2.6.6/scripts/kconfig: lex.zconf.c
Only in linux-2.6.6/scripts/kconfig: libkconfig.so
Only in linux-2.6.6/scripts/kconfig: mconf
Only in linux-2.6.6/scripts/kconfig: zconf.tab.c
Only in linux-2.6.6/scripts/kconfig: zconf.tab.h
Only in linux-2.6.6/scripts/lxdialog: lxdialog
Only in linux-2.6.6/scripts: mk_elfconfig
Only in linux-2.6.6/scripts: modpost
diff -ru5 linux-2.6.6-brian/scripts/openssi/Makefile linux-2.6.6/scripts/openssi/Makefile
--- linux-2.6.6-brian/scripts/openssi/Makefile 2004-06-26 11:23:48.000000000 +0530
+++ linux-2.6.6/scripts/openssi/Makefile 2004-07-02 12:35:35.000000000 +0530
@@ -2,24 +2,24 @@
# Makefile with OpenSSI specific rules
#
#Authors: Aneesh Kumar K.V <aneesh.kumar@digital.com>
#
-NSCICSGEN := $(objtree)/cluster/util/icsgen
+NSCICSGEN := $(srctree)/cluster/util/icsgen
# Rule for generating files from .svc
# One should have SVCFILES and NSCDEFS defined in the Makefile
%_gen.c: $(patsubst %,$(src)/%,$(SVCFILES))
@chmod +x $(NSCICSGEN)
$(Q)for svc_file in $< ; \
do \
- CPP="$(CC) -E $(CPPFLAGS) -include $(objtree)/include/linux/config.h" OUT_DIR=$(obj) \
+ CPP="$(CC) -E $(CPPFLAGS) -include $(srctree)/include/linux/config.h" OUT_DIR=$(obj) \
$(NSCICSGEN) $(NSCDEFS) $$svc_file; \
done
%_gen.h: $(patsubst %,$(src)/%,$(SVCFILES))
@chmod +x $(NSCICSGEN)
$(Q)for svc_file in $< ; \
do \
- CPP="$(CC) -E $(CPPFLAGS) -include $(objtree)/include/linux/config.h" OUT_DIR=$(obj) \
+ CPP="$(CC) -E $(CPPFLAGS) -include $(srctree)/include/linux/config.h" OUT_DIR=$(obj) \
$(NSCICSGEN) $(NSCDEFS) $$svc_file; \
done
Only in linux-2.6.6/scripts: pnmtologo
Only in linux-2.6.6: vmlinux.gz
next prev parent reply other threads:[~2004-07-08 9:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-08 5:34 [PATCH] Alpha print the symbol name in Oops Aneesh Kumar
2004-07-08 7:15 ` Andrew Morton
2004-07-08 9:16 ` Aneesh Kumar [this message]
2004-07-08 9:19 ` Andrew Morton
2004-07-08 9:19 ` Aneesh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc723f5904070802165c127e62@mail.gmail.com \
--to=aneesh.kumar@gmail.com \
--cc=akpm@osdl.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=rth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.