test3-pre8 compile fixes

From: Andrea Arcangeli (andrea@suse.de)
Date: Mon Jul 10 2000 - 18:03:23 EST


This patch fixes a couple of compile troubles (and a little bug) in the
alpha port:

--- 2.4.0-test3-pre8/fs/nfsd/nfsfh.c.~1~ Mon Jul 10 18:15:46 2000
+++ 2.4.0-test3-pre8/fs/nfsd/nfsfh.c Tue Jul 11 00:22:12 2000
@@ -379,7 +379,7 @@
         /* It's a directory, or we are required to confirm the file's
          * location in the tree.
          */
- dprintk("nfs_fh: need to look harder for %d/%ld\n",sb->s_dev,ino);
+ dprintk("nfs_fh: need to look harder for %d/%ld\n",sb->s_dev, (unsigned long) ino);
         down(&sb->s_nfsd_free_path_sem);
 
         /* claiming the semaphore might have allowed things to get fixed up */
--- 2.4.0-test3-pre8/fs/locks.c.~1~ Mon Jul 10 18:15:45 2000
+++ 2.4.0-test3-pre8/fs/locks.c Tue Jul 11 00:31:11 2000
@@ -296,7 +296,7 @@
         if (!list_empty(&waiter->fl_block)) {
                 printk(KERN_ERR "locks_insert_block: removing duplicated lock "
                         "(pid=%d %Ld-%Ld type=%d)\n", waiter->fl_pid,
- waiter->fl_start, waiter->fl_end, waiter->fl_type);
+ (long long) waiter->fl_start, (long long) waiter->fl_end, waiter->fl_type);
                 locks_delete_block(waiter);
         }
         list_add_tail(&waiter->fl_block, &blocker->fl_block);
--- 2.4.0-test3-pre8/arch/alpha/kernel/pci_iommu.c.~1~ Sat Jun 24 16:02:27 2000
+++ 2.4.0-test3-pre8/arch/alpha/kernel/pci_iommu.c Tue Jul 11 00:36:05 2000
@@ -416,7 +416,9 @@
         ptes = &arena->ptes[dma_ofs];
         sg = leader;
         do {
+#if DEBUG_ALLOC > 0
                 struct scatterlist *last_sg = sg;
+#endif
 
                 size = sg->length;
                 paddr = virt_to_phys(sg->address);
--- 2.4.0-test3-pre8/arch/alpha/lib/fpreg.c.~1~ Wed Dec 8 00:05:25 1999
+++ 2.4.0-test3-pre8/arch/alpha/lib/fpreg.c Tue Jul 11 00:58:13 2000
@@ -13,7 +13,7 @@
 unsigned long
 alpha_read_fp_reg (unsigned long reg)
 {
- unsigned long val;
+ unsigned long val = 0xbeefbeef;
 
         switch (reg) {
               case 0: STT( 0, val); break;
@@ -106,7 +106,7 @@
 unsigned long
 alpha_read_fp_reg_s (unsigned long reg)
 {
- unsigned long val;
+ unsigned long val = 0xbeefbeef;
 
         switch (reg) {
               case 0: STS( 0, val); break;
--- 2.4.0-test3-pre8/arch/alpha/mm/extable.c.~1~ Sat Jun 24 16:02:27 2000
+++ 2.4.0-test3-pre8/arch/alpha/mm/extable.c Tue Jul 11 00:56:19 2000
@@ -88,7 +88,7 @@
          */
         ret = search_exception_table_without_gp(addr);
         if (ret) {
- printk(KERN_ALERT, "%s: [%lx] EX_TABLE search fail with"
+ printk(KERN_ALERT "%s: [%lx] EX_TABLE search fail with"
                        "exc frame GP, success with raw GP\n",
                        current->comm, addr);
                 return ret;
--- 2.4.0-test3-pre8/arch/alpha/Makefile.~1~ Mon Jul 10 18:15:21 2000
+++ 2.4.0-test3-pre8/arch/alpha/Makefile Tue Jul 11 01:03:37 2000
@@ -117,6 +117,10 @@
 
 archdep:
         @$(MAKEBOOT) dep
+
+vmlinux: arch/alpha/vmlinux.lds
+
+arch/alpha/vmlinux.lds: arch/alpha/vmlinux.lds.in
         $(CPP) $(CPPFLAGS) -xc -P arch/alpha/vmlinux.lds.in -o arch/alpha/vmlinux.lds
 
 bootpfile:
--- 2.4.0-test3-pre8/include/asm-alpha/elf.h.~1~ Thu Apr 27 17:56:42 2000
+++ 2.4.0-test3-pre8/include/asm-alpha/elf.h Tue Jul 11 00:32:26 2000
@@ -127,7 +127,7 @@
 
 #ifdef __KERNEL__
 #define SET_PERSONALITY(EX, IBCS2) \
- set_personality((EX).e_flags & EF_ALPHA_32BIT \
+ set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
            ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
 #endif
 
--- 2.4.0-test3-pre8/include/linux/highmem.h.~1~ Mon Jul 10 18:56:24 2000
+++ 2.4.0-test3-pre8/include/linux/highmem.h Tue Jul 11 00:13:42 2000
@@ -23,7 +23,7 @@
 extern inline unsigned int nr_free_highpages(void) { return 0; }
 #define prepare_highmem_swapout(page) page
 #define replace_with_highmem(page) page
-#define kmap(page) page_address(page)
+#define kmap(page) ({ page_address(page); })
 #define kunmap(page) do { } while (0)
 
 #endif /* CONFIG_HIGHMEM */
--- 2.4.0-test3-pre8/kernel/sched.c.~1~ Mon Jul 10 18:15:50 2000
+++ 2.4.0-test3-pre8/kernel/sched.c Mon Jul 10 23:38:33 2000
@@ -219,7 +219,7 @@
          * one will have the least active cache context.) Also find
          * the executing process which has the least priority.
          */
- oldest_idle = -1ULL;
+ oldest_idle = -1;
         target_tsk = NULL;
         max_prio = 1;
 
@@ -239,7 +239,7 @@
                                 target_tsk = tsk;
                         }
                 } else {
- if (oldest_idle == -1ULL) {
+ if (oldest_idle == -1) {
                                 int prio = preemption_goodness(tsk, p, cpu);
 
                                 if (prio > max_prio) {
@@ -251,7 +251,7 @@
         }
         tsk = target_tsk;
         if (tsk) {
- if (oldest_idle != -1ULL)
+ if (oldest_idle != -1)
                         goto send_now_idle;
                 goto preempt_now;
         }

Andrea



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:24 EST