1
0
Fork 0

Fix ia64 build

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRJ6pGAAoJEKurIx+X31iBKBcP/3rjocD82oyIF9KuXPbrTz1Q
 c/h0M5EtbBJAuKCjUZnQ0Eg8H5hkjZu+Z/XO3yF5Qwy5XQDtau/1uOaj2CFqu0bA
 IRqynrfc89+Yec1Bf/Y39cs5tlaSsh9QG5y0CpWLdn++dRjcMhSTWkvGdewoaG1B
 yEODH9yfeL1ni+0pD5Qv0qTfgEGLfGzQFa0Bpcrg9h7VcHmoy0N6iYbg9XFJhPGM
 /jRPRkxXMuB9Sa7WPAquzRGMAZojS6WYArXfrJni7H3blSqhSiQdeqlnzaMDZSHp
 wO5SazkXtsr5+raPOv1wC7UqLGnBjeOewN3z8r6GgV6NEsdFo7mEMN+suEUfeDXg
 d3Tej8XLl2uF8fTbyyGGH8XelnCVNOGyrAlbLbb9i57X4xmJlx892ZKGNuB6iIIj
 7pkQCUmHX06fwNLECU6EK2bV5/vBwuQSQh92n4tF40LvcYLJky6jLY2BsaeZZkH/
 qKCkjUvvG4as7NBumeZ8JBWeR2Xx/pVpSMed4UxjxjXlr/BeGKomPssBOQa1FQ98
 dnqhBLIKS7EI6RSGiNfIIvq9yFYeR4bOAKzZ6ZwfsYF1Z/+KBhfupUpFMys+6f55
 MG7sWE8ZmF86w8KDUZTKl6Vk8bTP7vrIFVYPfGcx/U1JeixzLrnmCEELFIDNXeTk
 NRD4m5N80hd6H8JSFxcJ
 =nMr5
 -----END PGP SIGNATURE-----

Merge tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 build breakage fix from Tony Luck.

* tag 'please-pull-fix-ia64-build' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  sched: move RR_TIMESLICE from sysctl.h to rt.h
hifive-unleashed-5.1
Linus Torvalds 2013-02-22 19:27:23 -08:00
commit c68fea3464
2 changed files with 6 additions and 6 deletions

View File

@ -55,4 +55,10 @@ static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
extern void normalize_rt_tasks(void);
/*
* default timeslice is 100 msecs (used only for SCHED_RR tasks).
* Timeslices get refilled after they expire.
*/
#define RR_TIMESLICE (100 * HZ / 1000)
#endif /* _SCHED_RT_H */

View File

@ -91,12 +91,6 @@ extern unsigned int sysctl_sched_cfs_bandwidth_slice;
extern unsigned int sysctl_sched_autogroup_enabled;
#endif
/*
* default timeslice is 100 msecs (used only for SCHED_RR tasks).
* Timeslices get refilled after they expire.
*/
#define RR_TIMESLICE (100 * HZ / 1000)
extern int sched_rr_timeslice;
extern int sched_rr_handler(struct ctl_table *table, int write,