Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46097f27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4ec656bd 3eb53b20

arch/parisc/include/uapi/asm/errno.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -97,9 +97,9 @@ 
#define	ENOTCONN	235	/* Transport endpoint is not connected */

#define	ENOTCONN	235	/* Transport endpoint is not connected */

#define	ESHUTDOWN	236	/* Cannot send after transport endpoint shutdown */

#define	ESHUTDOWN	236	/* Cannot send after transport endpoint shutdown */

#define	ETOOMANYREFS	237	/* Too many references: cannot splice */

#define	ETOOMANYREFS	237	/* Too many references: cannot splice */

#define EREFUSED	ECONNREFUSED	/* for HP's NFS apparently */

#define	ETIMEDOUT	238	/* Connection timed out */

#define	ETIMEDOUT	238	/* Connection timed out */

#define	ECONNREFUSED	239	/* Connection refused */

#define	ECONNREFUSED	239	/* Connection refused */

#define	EREFUSED	ECONNREFUSED	/* for HP's NFS apparently */

#define	EREMOTERELEASE	240	/* Remote peer released connection */

#define	EREMOTERELEASE	240	/* Remote peer released connection */

#define	EHOSTDOWN	241	/* Host is down */

#define	EHOSTDOWN	241	/* Host is down */

#define	EHOSTUNREACH	242	/* No route to host */

#define	EHOSTUNREACH	242	/* No route to host */

arch/parisc/kernel/processor.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -51,8 +51,6 @@ EXPORT_SYMBOL(_parisc_requires_coherency); 




DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);

DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data);





extern int update_cr16_clocksource(void);	/* from time.c */



/*

/*

**  	PARISC CPU driver - claim "device" and initialize CPU data structures.

**  	PARISC CPU driver - claim "device" and initialize CPU data structures.

**

**
@@ -228,12 +226,6 @@ static int processor_probe(struct parisc_device *dev) 
	}

	}

#endif

#endif





	/* If we've registered more than one cpu,

	 * we'll use the jiffies clocksource since cr16

	 * is not synchronized between CPUs.

	 */

	update_cr16_clocksource();



	return 0;

	return 0;

}

}

arch/parisc/kernel/time.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -221,18 +221,6 @@ static struct clocksource clocksource_cr16 = { 
	.flags			= CLOCK_SOURCE_IS_CONTINUOUS,

	.flags			= CLOCK_SOURCE_IS_CONTINUOUS,

};

};





int update_cr16_clocksource(void)

{

	/* since the cr16 cycle counters are not synchronized across CPUs,

	   we'll check if we should switch to a safe clocksource: */

	if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) {

		clocksource_change_rating(&clocksource_cr16, 0);

		return 1;

	}



	return 0;

}



void __init start_cpu_itimer(void)

void __init start_cpu_itimer(void)

{

{

	unsigned int cpu = smp_processor_id();

	unsigned int cpu = smp_processor_id();