ia64: Sync with 2.5.44.

arch/ia64/Makefile

@@ -39,12 +39,13 @@ libs-y				+= arch/$(ARCH)/lib/
 core-y				+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
 core-$(CONFIG_IA32_SUPPORT)	+= arch/$(ARCH)/ia32/
 core-$(CONFIG_IA64_DIG) 	+= arch/$(ARCH)/dig/
-core-$(CONFIG_IA64_GENERIC) 	+= arch/$(ARCH)/hp/ arch/$(ARCH)/dig/
-core-$(CONFIG_IA64_HP_SIM)	+= arch/$(ARCH)/hp/
-core-$(CONFIG_IA64_HP_ZX1)	+= arch/$(ARCH)/hp/ arch/$(ARCH)/dig/
+core-$(CONFIG_IA64_GENERIC) 	+= arch/$(ARCH)/dig/ arch/$(ARCH)/hp/common/ arch/$(ARCH)/hp/zx1/ \
+				   arch/$(ARCH)/hp/sim/
+core-$(CONFIG_IA64_HP_ZX1)	+= arch/$(ARCH)/dig/
 core-$(CONFIG_IA64_SGI_SN)	+= arch/$(ARCH)/sn/kernel arch/$(ARCH)/sn/io \
 				   arch/$(ARCH)/sn/fakeprom
 drivers-$(CONFIG_PCI)		+= arch/$(ARCH)/pci/
+drivers-$(CONFIG_IA64_HP_SIM)	+= arch/$(ARCH)/hp/sim/
 drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/$(ARCH)/hp/common/ arch/$(ARCH)/hp/zx1/
 
 ifdef CONFIG_IA64_SGI_SN
@@ -52,24 +53,28 @@ ifdef CONFIG_IA64_SGI_SN
         SUBDIRS         	+= arch/$(ARCH)/sn/fakeprom
 endif
 
-MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+makeboot = $(call descend,arch/ia64/boot,$(1))
+maketool = $(call descend,arch/ia64/tools,$(1))
+
+.PHONY: compressed archclean archmrproper $(TOPDIR)/include/asm-ia64/offsets.h
+
+all: compressed boot
+
+boot: vmlinux
+	+@$(call makeboot,all)
 
 compressed: vmlinux
 	$(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux-tmp
 	gzip vmlinux-tmp
 	mv vmlinux-tmp.gz vmlinux.gz
 
-rawboot:
-	@$(MAKEBOOT) rawboot
-
 archclean:
-	@$(MAKEBOOT) clean
+	$(MAKE) -rR -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
 
 archmrproper:
-	@$(MAKE) -C arch/$(ARCH)/tools mrproper
 
 prepare: $(TOPDIR)/include/asm-ia64/offsets.h
 
 $(TOPDIR)/include/asm-ia64/offsets.h: include/asm include/linux/version.h \
 				      include/config/MARKER
-	@$(MAKE) -C arch/$(ARCH)/tools $@
+	+@$(call maketool,$@)

arch/ia64/boot/Makefile

@@ -8,9 +8,11 @@
 # Copyright (C) 1998 by David Mosberger-Tang <davidm@hpl.hp.com>
 #
 
-LINKFLAGS = -static -T bootloader.lds
+THIS	= arch/$(ARCH)/boot
 
-OBJECTS	= bootloader.o
+LINKFLAGS = -static -T $(THIS)/bootloader.lds
+
+OBJS	= $(THIS)/bootloader.o
 
 targets-$(CONFIG_IA64_HP_SIM)	+= bootloader
 targets-$(CONFIG_IA64_GENERIC)	+= bootloader
@@ -19,8 +21,8 @@ CFLAGS	:= $(CFLAGS) $(CFLAGS_KERNEL)
 
 all:	$(targets-y)
 
-bootloader: $(OBJECTS)
-	$(LD) $(LINKFLAGS) $(OBJECTS) $(TOPDIR)/lib/lib.a $(TOPDIR)/arch/$(ARCH)/lib/lib.a \
+bootloader: $(OBJS)
+	$(LD) $(LINKFLAGS) $(OBJS) $(TOPDIR)/lib/lib.a $(TOPDIR)/arch/$(ARCH)/lib/lib.a \
 	-o bootloader
 
 clean:

arch/ia64/defconfig

@@ -61,9 +61,9 @@ CONFIG_IA32_SUPPORT=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
 CONFIG_EFI_VARS=y
+CONFIG_NR_CPUS=16
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-CONFIG_NR_CPUS=64
 
 #
 # ACPI Support
@@ -100,6 +100,12 @@ CONFIG_PCI_NAMES=y
 # Plug and Play configuration
 #
 # CONFIG_PNP is not set
+# CONFIG_PNP_NAMES is not set
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
 # CONFIG_ISAPNP is not set
 # CONFIG_PNPBIOS is not set
 
@@ -189,6 +195,8 @@ CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_GENERIC is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDE_TCQ is not set
+# CONFIG_BLK_DEV_IDE_TCQ_DEFAULT is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 # CONFIG_IDEDMA_PCI_AUTO is not set
@@ -258,6 +266,7 @@ CONFIG_SCSI_LOGGING=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -294,6 +303,7 @@ CONFIG_SCSI_QLOGIC_1280=y
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #
@@ -370,6 +380,11 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
 CONFIG_NET_PCI=y
@@ -438,11 +453,6 @@ CONFIG_EEPRO100=y
 #
 # CONFIG_WAN is not set
 
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-
 #
 # Amateur Radio support
 #
@@ -574,6 +584,8 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_PHILIPSPAR is not set
 # CONFIG_I2C_ELV is not set
 # CONFIG_I2C_VELLEMAN is not set
+# CONFIG_SCx200_I2C is not set
+# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_ALGOPCF is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_PROC=y
@@ -614,12 +626,12 @@ CONFIG_AGP_I460=y
 CONFIG_AGP_HP_ZX1=y
 CONFIG_DRM=y
 CONFIG_DRM_TDFX=y
-CONFIG_DRM_GAMMA=y
 CONFIG_DRM_R128=y
 CONFIG_DRM_RADEON=y
 CONFIG_DRM_I810=y
 CONFIG_DRM_I830=y
 CONFIG_DRM_MGA=y
+# CONFIG_SCx200_GPIO is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
@@ -693,14 +705,17 @@ CONFIG_EXT2_FS=y
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
+CONFIG_NFS_V4=y
 # CONFIG_ROOT_NFS is not set
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_V4=y
 # CONFIG_NFSD_TCP is not set
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
+# CONFIG_CIFS is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NCPFS_PACKET_SIGNING is not set
@@ -711,6 +726,7 @@ CONFIG_EXPORTFS=y
 # CONFIG_NCPFS_SMALLDOS is not set
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
+# CONFIG_AFS_FS is not set
 # CONFIG_ZISOFS_FS is not set
 
 #
@@ -963,6 +979,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_BRLVGER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_TEST is not set
 
 #
 # Library routines
@@ -993,8 +1010,6 @@ CONFIG_IA64_EARLY_PRINTK_VGA=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
-# CONFIG_KDB is not set
-# CONFIG_KDB_MODULES is not set
 
 #
 # Security options

arch/ia64/hp/Makefile

-# arch/ia64/hp/Makefile
-# Copyright (c) 2002 Matthew Wilcox for Hewlett Packard
-
-obj-$(CONFIG_IA64_GENERIC)	+= sim/ zx1/ common/
-obj-$(CONFIG_IA64_HP_SIM)	+= sim/
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/sim/simscsi.c

@@ -361,7 +361,9 @@ simscsi_queuecommand (Scsi_Cmnd *sc, void (*done)(Scsi_Cmnd *))
 			break;
 
 		      case MODE_SENSE:
-			printk("MODE_SENSE\n");
+			/* sd.c uses this to determine whether disk does write-caching. */
+			memset(sc->request_buffer, 0, 128);
+			sc->result = GOOD;
 			break;
 
 		      case START_STOP:
@@ -391,6 +393,4 @@ simscsi_queuecommand (Scsi_Cmnd *sc, void (*done)(Scsi_Cmnd *))
 
 static Scsi_Host_Template driver_template = SIMSCSI;
 
-#define __initcall(fn)	late_initcall(fn)
-
 #include "../drivers/scsi/scsi_module.c"

arch/ia64/hp/sim/simserial.c

@@ -752,8 +752,7 @@ static int get_async_struct(int line, struct async_struct **ret_info)
 	info->flags = sstate->flags;
 	info->xmit_fifo_size = sstate->xmit_fifo_size;
 	info->line = line;
-	info->tqueue.routine = do_softint;
-	info->tqueue.data = info;
+	INIT_WORK(&info->work, do_softint, info);
 	info->state = sstate;
 	if (sstate->info) {
 		kfree(info);

arch/ia64/ia32/ia32_signal.c

@@ -456,13 +456,13 @@ ia32_rt_sigsuspend (sigset32_t *uset, unsigned int sigsetsize, struct sigscratch
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
 
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sig->siglock);
 	{
 		oldset = current->blocked;
 		current->blocked = set;
 		recalc_sigpending();
 	}
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sig->siglock);
 
 	/*
 	 * The return below usually returns to the signal handler.  We need to pre-set the
@@ -993,10 +993,10 @@ sys32_sigreturn (int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sig->siglock);
 	current->blocked = (sigset_t) set;
 	recalc_sigpending();
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sig->siglock);
 
 	if (restore_sigcontext_ia32(regs, &frame->sc, &eax))
 		goto badframe;
@@ -1024,10 +1024,10 @@ sys32_rt_sigreturn (int arg0, int arg1, int arg2, int arg3, int arg4, int arg5,
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sig->siglock);
 	current->blocked =  set;
 	recalc_sigpending();
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sig->siglock);
 
 	if (restore_sigcontext_ia32(regs, &frame->uc.uc_mcontext, &eax))
 		goto badframe;

arch/ia64/kernel/signal.c

@@ -68,13 +68,13 @@ ia64_rt_sigsuspend (sigset_t *uset, size_t sigsetsize, struct sigscratch *scr)
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
 
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sig->siglock);
 	{
 		oldset = current->blocked;
 		current->blocked = set;
 		recalc_sigpending();
 	}
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sig->siglock);
 
 	/*
 	 * The return below usually returns to the signal handler.  We need to
@@ -274,12 +274,12 @@ ia64_rt_sigreturn (struct sigscratch *scr)
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
 
-	spin_lock_irq(&current->sigmask_lock);
+	spin_lock_irq(&current->sig->siglock);
 	{
 		current->blocked = set;
 		recalc_sigpending();
 	}
-	spin_unlock_irq(&current->sigmask_lock);
+	spin_unlock_irq(&current->sig->siglock);
 
 	if (restore_sigcontext(sc, scr))
 		goto give_sigsegv;
@@ -468,13 +468,13 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigse
 		ka->sa.sa_handler = SIG_DFL;
 
 	if (!(ka->sa.sa_flags & SA_NODEFER)) {
-		spin_lock_irq(&current->sigmask_lock);
+		spin_lock_irq(&current->sig->siglock);
 		{
 			sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
 			sigaddset(&current->blocked, sig);
 			recalc_sigpending();
 		}
-		spin_unlock_irq(&current->sigmask_lock);
+		spin_unlock_irq(&current->sig->siglock);
 	}
 	return 1;
 }

arch/ia64/kernel/time.c

@@ -35,6 +35,7 @@ unsigned long last_cli_ip;
 
 #endif
 
+#if 0
 static void
 do_profile (unsigned long ip)
 {
@@ -58,6 +59,7 @@ do_profile (unsigned long ip)
 
 	atomic_inc((atomic_t *) &prof_buffer[ip]);
 }
+#endif
 
 /*
  * Return the number of micro-seconds that elapsed since the last update to jiffy.  The
@@ -166,8 +168,11 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 		 * four so that we can use a prof_shift of 2 to get instruction-level
 		 * instead of just bundle-level accuracy.
 		 */
+#if 0
+		XXX fix me!
 		if (!user_mode(regs))
 			do_profile(regs->cr_iip + 4*ia64_psr(regs)->ri);
+#endif
 
 #ifdef CONFIG_SMP
 		smp_do_timer(regs);

arch/ia64/kernel/traps.c

@@ -69,7 +69,6 @@ bust_spinlocks (int yes)
 {
 	int loglevel_save = console_loglevel;
 
-	spin_lock_init(&timerlist_lock);
 	if (yes) {
 		oops_in_progress = 1;
 		return;

arch/ia64/lib/Makefile

@@ -2,6 +2,8 @@
 # Makefile for ia64-specific library routines..
 #
 
+THIS = arch/$(ARCH)/lib
+
 L_TARGET = lib.a
 
 export-objs := swiotlb.o
@@ -32,26 +34,26 @@ AFLAGS___udivsi3.o	= -DUNSIGNED
 AFLAGS___modsi3.o	=	     -DMODULO
 AFLAGS___umodsi3.o	= -DUNSIGNED -DMODULO
 
-__divdi3.o: idiv64.S
+$(THIS)/__divdi3.o: $(THIS)/idiv64.S
 	$(cmd_as_o_S)
 
-__udivdi3.o: idiv64.S
+$(THIS)/__udivdi3.o: $(THIS)/idiv64.S
 	$(cmd_as_o_S)
 
-__moddi3.o: idiv64.S
+$(THIS)/__moddi3.o: $(THIS)/idiv64.S
 	$(cmd_as_o_S)
 
-__umoddi3.o: idiv64.S
+$(THIS)/__umoddi3.o: $(THIS)/idiv64.S
 	$(cmd_as_o_S)
 
-__divsi3.o: idiv32.S
+$(THIS)/__divsi3.o: $(THIS)/idiv32.S
 	$(cmd_as_o_S)
 
-__udivsi3.o: idiv32.S
+$(THIS)/__udivsi3.o: $(THIS)/idiv32.S
 	$(cmd_as_o_S)
 
-__modsi3.o: idiv32.S
+$(THIS)/__modsi3.o: $(THIS)/idiv32.S
 	$(cmd_as_o_S)
 
-__umodsi3.o: idiv32.S
+$(THIS)/__umodsi3.o: $(THIS)/idiv32.S
 	$(cmd_as_o_S)

arch/ia64/tools/Makefile

 CFLAGS	= -g -O2 -Wall $(CPPFLAGS)
 
+THIS	= arch/$(ARCH)/tools
 TARGET	= $(TOPDIR)/include/asm-ia64/offsets.h
 
 all:
@@ -9,13 +10,14 @@ fastdep:
 mrproper: clean
 
 clean:
-	rm -f print_offsets.s print_offsets offsets.h
+	rm -f $(THIS)/print_offsets.s $(THIS)/print_offsets $(THIS)/offsets.h
 
-$(TARGET): offsets.h
-	@if ! cmp -s offsets.h ${TARGET}; then	\
+$(TARGET): $(THIS)/offsets.h
+	echo here we go
+	if ! cmp -s $(THIS)/offsets.h ${TARGET}; then	\
 		echo -e "*** Updating ${TARGET}...";	\
-		cp offsets.h ${TARGET};		\
-	else					\
+		cp $(THIS)/offsets.h ${TARGET};		\
+	else						\
 		echo "*** ${TARGET} is up to date";	\
 	fi
 
@@ -30,25 +32,24 @@ $(TARGET): offsets.h
 
 ifeq ($(CROSS_COMPILE),)
 
-offsets.h: print_offsets
-	./print_offsets > offsets.h
+$(THIS)/offsets.h: $(THIS)/print_offsets
+	$(THIS)/print_offsets > $(THIS)/offsets.h
 
 comma	:= ,
 
-print_offsets: print_offsets.c FORCE
+$(THIS)/print_offsets: $(THIS)/print_offsets.c FORCE
 	$(CC) $(CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
-		print_offsets.c -o $@
+		$(THIS)/print_offsets.c -o $@
 
 FORCE:
 
 else
 
-offsets.h: print_offsets.s
-	$(AWK) -f print_offsets.awk $^ > $@
+$(THIS)/offsets.h: $(THIS)/print_offsets.s
+	$(AWK) -f $(THIS)/print_offsets.awk $^ > $@
 
-print_offsets.s: print_offsets.c
-	$(CC) $(CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -S \
-		print_offsets.c -o $@
+$(THIS)/print_offsets.s: $(THIS)/print_offsets.c
+	$(CC) $(CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -S $^ -o $@
 
 endif
 

arch/ia64/vmlinux.lds.S

@@ -12,11 +12,11 @@ SECTIONS
 {
   /* Sections to be discarded */
   /DISCARD/ : {
-	*(.text.exit)
-	*(.data.exit)
+	*(.exit.text)
+	*(.exit.data)
 	*(.exitcall.exit)
-	*(.IA_64.unwind.text.exit)
-	*(.IA_64.unwind_info.text.exit)
+	*(.IA_64.unwind.exit.text)
+	*(.IA_64.unwind_info.exit.text)
 	}
 
   v = PAGE_OFFSET;	/* this symbol is here to make debugging easier... */
@@ -65,6 +65,13 @@ SECTIONS
 	{ *(__ksymtab) }
   __stop___ksymtab = .;
 
+  __kallsyms : AT(ADDR(__kallsyms) - PAGE_OFFSET)
+	{
+	  __start___kallsyms = .;	/* All kernel symbols */
+	  *(__kallsyms)
+	  __stop___kallsyms = .;
+	}
+
   /* Unwind info & table: */
   . = ALIGN(8);
   .IA_64.unwind_info : AT(ADDR(.IA_64.unwind_info) - PAGE_OFFSET)
@@ -85,15 +92,15 @@ SECTIONS
 
   . = ALIGN(PAGE_SIZE);
   __init_begin = .;
-  .text.init : AT(ADDR(.text.init) - PAGE_OFFSET)
-	{ *(.text.init) }
+  .init.text : AT(ADDR(.init.text) - PAGE_OFFSET)
+	{ *(.init.text) }
 
-  .data.init : AT(ADDR(.data.init) - PAGE_OFFSET)
-	{ *(.data.init) }
+  .init.data : AT(ADDR(.init.data) - PAGE_OFFSET)
+	{ *(.init.data) }
    . = ALIGN(16);
   __setup_start = .;
-  .setup.init : AT(ADDR(.setup.init) - PAGE_OFFSET)
-        { *(.setup.init) }
+  .init.setup : AT(ADDR(.init.setup) - PAGE_OFFSET)
+        { *(.init.setup) }
   __setup_end = .;
   __initcall_start = .;
   .initcall.init : AT(ADDR(.initcall.init) - PAGE_OFFSET)
@@ -160,14 +167,6 @@ SECTIONS
   .bss : AT(ADDR(.bss) - PAGE_OFFSET)
 	{ *(.bss) *(COMMON) }
 
-  /* XXX Must this come last to avoid shifting other symbols?  --davidm */
-  __kallsyms : AT(ADDR(__kallsyms) - PAGE_OFFSET)
-	{
-	  __start___kallsyms = .;	/* All kernel symbols */
-	  *(__kallsyms)
-	  __stop___kallsyms = .;
-	}
-
   _end = .;
 
   /* Stabs debugging sections.  */