Merge with head.

--HG--
extra : convert_revision : 7700f475caa676948175cdf126ee018b0c4ad35c

src/arch/alpha/linux/threadinfo.hh

@@ -57,7 +57,7 @@ class ThreadInfo
          * thread_info struct. So we can get the address by masking off
          * the lower 14 bits.
          */
-        current = tc->readIntReg(TheISA::StackPointerReg) & ~0x3fff;
+        current = tc->readIntReg(TheISA::StackPointerReg) & ~ULL(0x3fff);
         return VPtr<thread_info>(tc, current);
     }