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

Commit 19ba20f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc update from David Miller:
 "Two cleanups from Paul Gortmaker and hook up the new scheduler system
  calls"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Hook up sched_setattr and sched_getattr syscalls.
  sparc: don't use module_init in non-modular pci.c code
  sparc: delete non-required instances of include <linux/init.h>
parents 3308ee8f a54983ae

arch/sparc/include/uapi/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -408,8 +408,10 @@ 
#define __NR_kern_features	340

#define __NR_kcmp		341

#define __NR_finit_module	342

#define __NR_sched_setattr	343

#define __NR_sched_getattr	344



#define NR_syscalls		343

#define NR_syscalls		345



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/cpumap.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/export.h>

#include <linux/slab.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/cpumask.h>

#include <linux/spinlock.h>

#include <asm/cpudata.h>

arch/sparc/kernel/ebus.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

arch/sparc/kernel/hvtramp.S

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>

 */



#include <linux/init.h>



#include <asm/thread_info.h>

#include <asm/hypervisor.h>

arch/sparc/kernel/of_device_common.c

+0 −1
Original line number Diff line number Diff line 
#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/mod_devicetable.h>

#include <linux/errno.h>