Semi-Merge commit '52de717' into cg_merges_20121207 (just reorder __maybe_unused)

Conflicts:
	driver-cpu.c
	sha256_via.c

driver-cpu.c

@@ -67,7 +67,7 @@ static inline void drop_policy(void)
 {
 }
 
-static inline void affine_to_cpu(__maybe_unused int id, __maybe_unused int cpu)
+static inline void affine_to_cpu(int __maybe_unused id, int __maybe_unused cpu)
 {
 }
 #endif
@@ -785,7 +785,7 @@ static bool cpu_thread_prepare(struct thr_info *thr)
 	return true;
 }
 
-static uint64_t cpu_can_limit_work(__maybe_unused struct thr_info *thr)
+static uint64_t cpu_can_limit_work(struct thr_info __maybe_unused *thr)
 {
 	return 0xffff;
 }

sha256_4way.c

@@ -47,11 +47,11 @@ static inline __m128i Maj(const __m128i b, const __m128i c, const __m128i d) {
     return _mm_xor_si128(_mm_xor_si128(_mm_and_si128(b,c),_mm_and_si128(b,d)),_mm_and_si128(c,d));
 }
 
-static __attribute__((always_inline)) __m128i  ROTR(__m128i x, const int n) {
+static inline __m128i  ROTR(__m128i x, const int n) {
     return _mm_or_si128(_mm_srli_epi32(x, n),_mm_slli_epi32(x, 32 - n));
 }
 
-static  __attribute__((always_inline))  __m128i SHR(__m128i x, const int n) {
+static inline __m128i SHR(__m128i x, const int n) {
     return _mm_srli_epi32(x, n);
 }
 

sha256_via.c

@@ -19,9 +19,9 @@ static void via_sha256(void *hash, void *buf, unsigned len)
 		     :"memory");
 }
 
-bool scanhash_via(struct thr_info*thr, __maybe_unused const unsigned char *pmidstate,
+bool scanhash_via(struct thr_info*thr, const unsigned char __maybe_unused *pmidstate,
 	unsigned char *data_inout,
-	__maybe_unused unsigned char *phash1, __maybe_unused unsigned char *phash,
+	unsigned char __maybe_unused *phash1, unsigned char __maybe_unused *phash,
 	const unsigned char *target,
 		  uint32_t max_nonce, uint32_t *last_nonce,
 		  uint32_t n)