ia64: Fix do_profile() to account kernel ticks spent on behalf of pid 0. Clean

	up arch/ia64/config.in (based on patch by Keith Owens).

arch/ia64/config.in

@@ -100,22 +100,20 @@ tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
+  source drivers/acpi/Config.in
 
-source drivers/acpi/Config.in
+  bool 'PCI support' CONFIG_PCI
+  source drivers/pci/Config.in
 
-bool 'PCI support' CONFIG_PCI
-source drivers/pci/Config.in
-
-bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG
-if [ "$CONFIG_HOTPLUG" = "y" ]; then
+  bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG
+  if [ "$CONFIG_HOTPLUG" = "y" ]; then
      source drivers/hotplug/Config.in
      source drivers/pcmcia/Config.in
-else
+  else
      define_bool CONFIG_PCMCIA n
-fi
-
-source drivers/parport/Config.in
+  fi
 
+  source drivers/parport/Config.in
 fi # !HP_SIM
 
 endmenu
@@ -125,43 +123,41 @@ if [ "$CONFIG_NET" = "y" ]; then
 fi
 
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
+  define_tristate CONFIG_BLK_DEV_LOOP n
+  define_tristate CONFIG_BLK_DEV_NBD n
+  define_tristate CONFIG_BLK_DEV_RAM n
+
+  source drivers/mtd/Config.in
+  source drivers/pnp/Config.in
+  source drivers/block/Config.in
+  source drivers/ieee1394/Config.in
+  source drivers/message/i2o/Config.in
+  source drivers/md/Config.in
+  source drivers/message/fusion/Config.in
 
-define_tristate CONFIG_BLK_DEV_LOOP n
-define_tristate CONFIG_BLK_DEV_NBD n
-define_tristate CONFIG_BLK_DEV_RAM n
-
-source drivers/mtd/Config.in
-source drivers/pnp/Config.in
-source drivers/block/Config.in
-source drivers/ieee1394/Config.in
-source drivers/message/i2o/Config.in
-source drivers/md/Config.in
-source drivers/message/fusion/Config.in
-
-mainmenu_option next_comment
-comment 'ATA/IDE/MFM/RLL support'
+  mainmenu_option next_comment
+  comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+  tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
 
-if [ "$CONFIG_IDE" != "n" ]; then
+  if [ "$CONFIG_IDE" != "n" ]; then
     source drivers/ide/Config.in
-else
+  else
     define_bool CONFIG_BLK_DEV_HD n
-fi
-endmenu
-
-else # ! HP_SIM
-mainmenu_option next_comment
-comment 'Block devices'
-tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
-dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
+  fi
+  endmenu
+else # HP_SIM
+  mainmenu_option next_comment
+  comment 'Block devices'
+  tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
+  dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
 
-tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
-if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+  tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
+  if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
     int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
-fi
-endmenu
-fi # !HP_SIM
+  fi
+  endmenu
+fi # HP_SIM
 
 mainmenu_option next_comment
 comment 'SCSI support'
@@ -174,8 +170,7 @@ fi
 endmenu
 
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
-
-if [ "$CONFIG_NET" = "y" ]; then
+  if [ "$CONFIG_NET" = "y" ]; then
     mainmenu_option next_comment
     comment 'Network device support'
 
@@ -184,21 +179,20 @@ if [ "$CONFIG_NET" = "y" ]; then
       source drivers/net/Config.in
     fi
     endmenu
-fi
+  fi
 
-source net/ax25/Config.in
+  source net/ax25/Config.in
 
-source drivers/isdn/Config.in
+  source drivers/isdn/Config.in
 
-mainmenu_option next_comment
-comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'
+  mainmenu_option next_comment
+  comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'
 
-bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
-if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
+  bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
+  if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
     source drivers/cdrom/Config.in
-fi
-endmenu
-
+  fi
+  endmenu
 fi # !HP_SIM
 
 #
@@ -226,21 +220,18 @@ fi
 
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
 
-mainmenu_option next_comment
-comment 'Sound'
+  mainmenu_option next_comment
+  comment 'Sound'
 
-tristate 'Sound card support' CONFIG_SOUND
-if [ "$CONFIG_SOUND" != "n" ]; then
+  tristate 'Sound card support' CONFIG_SOUND
+  if [ "$CONFIG_SOUND" != "n" ]; then
     source sound/Config.in
-fi
-endmenu
-
-source drivers/usb/Config.in
-
-source lib/Config.in
-
-source net/bluetooth/Config.in
+  fi
+  endmenu
 
+  source drivers/usb/Config.in
+  source lib/Config.in
+  source net/bluetooth/Config.in
 fi # !HP_SIM
 
 if [ "$CONFIG_IA64_HP_SIM" != "n" -o "$CONFIG_IA64_GENERIC" != "n" ]; then

arch/ia64/kernel/time.c

@@ -39,10 +39,12 @@ do_profile (unsigned long ip)
 	extern unsigned long prof_cpu_mask;
 	extern char _stext;
 
+	if (!prof_buffer)
+		return;
+
 	if (!((1UL << smp_processor_id()) & prof_cpu_mask))
 		return;
 
-	if (prof_buffer && current->pid) {
 	ip -= (unsigned long) &_stext;
 	ip >>= prof_shift;
 	/*
@@ -53,7 +55,6 @@ do_profile (unsigned long ip)
 		ip = prof_len - 1;
 
 	atomic_inc((atomic_t *) &prof_buffer[ip]);
-	}
 }
 
 /*