Alpha print the symbol name in Oops

@@ -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,21 @@
 
 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>]", tmp);
+		print_symbol(" %s\n", tmp);
 		if (i > 40) {
 			printk(" ...");
 			break;
 		}
 	}

diff -ru5 linux-2.6.6-brian/arch/alpha/kernel/traps.c linux-2.6.6/arch/alpha/kernel/traps.c
@@ -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/cluster/clms/clms_client.c linux-2.6.6/cluster/clms/clms_client.c
@@ -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
@@ -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/util/node_monitor.c linux-2.6.6/cluster/util/node_monitor.c
@@ -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
@@ -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
@@ -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
@@ -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;

diff -ru5 linux-2.6.6-brian/include/asm-i386/unistd.h linux-2.6.6/include/asm-i386/unistd.h
@@ -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 { \

diff -ru5 linux-2.6.6-brian/include/cluster/clms.h linux-2.6.6/include/cluster/clms.h
@@ -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;

95 lines not on this page · raw message

diff -ru5 linux-2.6.6-brian/include/cluster/rpc/rpc_msg.h linux-2.6.6/include/cluster/rpc/rpc_msg.h
@@ -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

diff -ru5 linux-2.6.6-brian/net/ipv4/tcp.c linux-2.6.6/net/ipv4/tcp.c
@@ -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.

@@ -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>]", tmp);
+		print_symbol(" %s", tmp);
+		printk("\n");
 		if (i > 40) {
 			printk(" ...");
 			break;
 		}
 	}