[oprof-cvs] CVS: oprofile oprofile.c,1.64,1.65

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile
In directory usw-pr-cvs1:/tmp/cvs-serv1792

Modified Files:
	oprofile.c 
Log Message:

whitespace changes



Index: oprofile.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/oprofile.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** oprofile.c	2001/07/26 01:39:15	1.64
--- oprofile.c	2001/07/27 00:47:16	1.65
***************
*** 605,609 ****
  	if (num < oprof_data[cpu_num].buf_size-OP_PRE_WATERMARK && oprof_ready[cpu_num] != 2) {
  		printk(KERN_ERR "oprofile: Detected overflow of size %d. You must increase the "
! 				"hash table size or reduce the interrupt frequency (%d)\n", 
  				num, oprof_ready[cpu_num]);
  		num = oprof_data[cpu_num].buf_size;
--- 605,609 ----
  	if (num < oprof_data[cpu_num].buf_size-OP_PRE_WATERMARK && oprof_ready[cpu_num] != 2) {
  		printk(KERN_ERR "oprofile: Detected overflow of size %d. You must increase the "
! 				"hash table size or reduce the interrupt frequency (%d)\n",
  				num, oprof_ready[cpu_num]);
  		num = oprof_data[cpu_num].buf_size;
***************
*** 752,763 ****
  		}
  	}
!  
  	/* FIXME: below needs generalising for multiple counters */
!  
  	if (!op_ctr_on[0] && !op_ctr_on[1]) {
  		printk(KERN_ERR "oprofile: neither counter enabled.\n");
  		return 0;
  	}
!  
  	/* hw_ok() has set cpu_type */
  	ret = op_check_events(op_ctr_val[0], op_ctr_val[1], op_ctr_um[0], op_ctr_um[1], cpu_type);
--- 752,763 ----
  		}
  	}
! 
  	/* FIXME: below needs generalising for multiple counters */
! 
  	if (!op_ctr_on[0] && !op_ctr_on[1]) {
  		printk(KERN_ERR "oprofile: neither counter enabled.\n");
  		return 0;
  	}
! 
  	/* hw_ok() has set cpu_type */
  	ret = op_check_events(op_ctr_val[0], op_ctr_val[1], op_ctr_um[0], op_ctr_um[1], cpu_type);
***************
*** 776,780 ****
  	if (ret)
  		return 0;
!  
  	for (cpu=0; cpu < smp_num_cpus; cpu++) {
  		data = &oprof_data[cpu];
--- 776,780 ----
  	if (ret)
  		return 0;
! 
  	for (cpu=0; cpu < smp_num_cpus; cpu++) {
  		data = &oprof_data[cpu];
***************
*** 793,797 ****
  }
  
!  
  DECLARE_MUTEX(sysctlsem);
  
--- 793,797 ----
  }
  
! 
  DECLARE_MUTEX(sysctlsem);
  
***************
*** 981,985 ****
  
  static int nr_oprof_static = 6;
!  
  static ctl_table oprof_table[] = {
  	{ 1, "bufsize", &op_buf_size, sizeof(int), 0600, NULL, &lproc_dointvec, NULL, },
--- 981,985 ----
  
  static int nr_oprof_static = 6;
! 
  static ctl_table oprof_table[] = {
  	{ 1, "bufsize", &op_buf_size, sizeof(int), 0600, NULL, &lproc_dointvec, NULL, },
***************
*** 1014,1018 ****
  	ctl_table *next = &oprof_table[nr_oprof_static];
  	ctl_table *counter_table[OP_MAX_COUNTERS];
! 	ctl_table *tab; 
  	int i,j;
  
--- 1014,1018 ----
  	ctl_table *next = &oprof_table[nr_oprof_static];
  	ctl_table *counter_table[OP_MAX_COUNTERS];
! 	ctl_table *tab;
  	int i,j;
  
***************
*** 1030,1034 ****
  
  		tab = counter_table[i];
!  
  		memset(tab, 0, sizeof(ctl_table)*7);
  		tab[0] = ((ctl_table){ 1, "enabled", &op_ctr_on[i], sizeof(int), 0600, NULL, lproc_dointvec, NULL, });
--- 1030,1034 ----
  
  		tab = counter_table[i];
! 
  		memset(tab, 0, sizeof(ctl_table)*7);
  		tab[0] = ((ctl_table){ 1, "enabled", &op_ctr_on[i], sizeof(int), 0600, NULL, lproc_dointvec, NULL, });
***************
*** 1043,1047 ****
  	sysctl_header = register_sysctl_table(dev_root, 0);
  	return 0;
!  
  cleanup:
  	next = &oprof_table[nr_oprof_static];
--- 1043,1047 ----
  	sysctl_header = register_sysctl_table(dev_root, 0);
  	return 0;
! 
  cleanup:
  	next = &oprof_table[nr_oprof_static];
***************
*** 1123,1131 ****
  	smp_call_function(smp_apic_restore, NULL, 0, 1);
  	smp_apic_restore(NULL);
!  
  	cleanup_sysctl();
  	// currently no need to reset APIC state
  }
!  
  /*
   * "The most valuable commodity I know of is information."
--- 1123,1131 ----
  	smp_call_function(smp_apic_restore, NULL, 0, 1);
  	smp_apic_restore(NULL);
! 
  	cleanup_sysctl();
  	// currently no need to reset APIC state
  }
! 
  /*
   * "The most valuable commodity I know of is information."