Merge branch 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull two parisc fixes from Helge Deller:
"The first patch ensures that the high-res cr16 clocksource (which was
added in kernel 4.7) gets choosen as default clocksource for parisc.

The second patch moves the #define of EREFUSED down inside errno.h and
thus unbreaks building the gccgo compiler"

* 'parisc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix order of EREFUSED define in errno.h
parisc: Fix automatic selection of cr16 clocksource

Changed files
+2 -22
arch
parisc
include
uapi
asm
kernel
+2 -2
arch/parisc/include/uapi/asm/errno.h
··· 97 97 #define ENOTCONN 235 /* Transport endpoint is not connected */ 98 98 #define ESHUTDOWN 236 /* Cannot send after transport endpoint shutdown */ 99 99 #define ETOOMANYREFS 237 /* Too many references: cannot splice */ 100 - #define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ 101 100 #define ETIMEDOUT 238 /* Connection timed out */ 102 101 #define ECONNREFUSED 239 /* Connection refused */ 103 - #define EREMOTERELEASE 240 /* Remote peer released connection */ 102 + #define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ 103 + #define EREMOTERELEASE 240 /* Remote peer released connection */ 104 104 #define EHOSTDOWN 241 /* Host is down */ 105 105 #define EHOSTUNREACH 242 /* No route to host */ 106 106
-8
arch/parisc/kernel/processor.c
··· 51 51 52 52 DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data); 53 53 54 - extern int update_cr16_clocksource(void); /* from time.c */ 55 - 56 54 /* 57 55 ** PARISC CPU driver - claim "device" and initialize CPU data structures. 58 56 ** ··· 225 227 cpu_up(cpuid); 226 228 } 227 229 #endif 228 - 229 - /* If we've registered more than one cpu, 230 - * we'll use the jiffies clocksource since cr16 231 - * is not synchronized between CPUs. 232 - */ 233 - update_cr16_clocksource(); 234 230 235 231 return 0; 236 232 }
-12
arch/parisc/kernel/time.c
··· 221 221 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 222 222 }; 223 223 224 - int update_cr16_clocksource(void) 225 - { 226 - /* since the cr16 cycle counters are not synchronized across CPUs, 227 - we'll check if we should switch to a safe clocksource: */ 228 - if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) { 229 - clocksource_change_rating(&clocksource_cr16, 0); 230 - return 1; 231 - } 232 - 233 - return 0; 234 - } 235 - 236 224 void __init start_cpu_itimer(void) 237 225 { 238 226 unsigned int cpu = smp_processor_id();