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

Commit 5ac12c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix two year old bug in early bootup asm.
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix log message type in vio_create_one().
  [SPARC64]: Tweak assertions in sun4v_build_virq().
  [SPARC64]: Tweak kernel log messages in power_probe().
  [SPARC64]: Fix handling of multiple vdc-port nodes.
  [SPARC64]: Fix device type matching in VIO's devspec_show().
  [SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET.
  [SPARC]: Add sys_fallocate() entries.
  [SPARC64]: Use orderly_poweroff().
parents 52a23685 78d00125

arch/sparc/kernel/systbls.S

+4 −5
Original line number Diff line number Diff line 
/* $Id: systbls.S,v 1.103 2002/02/08 03:57:14 davem Exp $

 * systbls.S: System call entry point tables for OS compatibility.

/* systbls.S: System call entry point tables for OS compatibility.

 *            The native Linux system call table lives here also.

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net)

 *

 * Based upon preliminary work which is:

 *
@@ -80,7 +79,7 @@ sys_call_table: 
/*295*/	.long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare

/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

/*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait

/*310*/	.long sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd

/*310*/	.long sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd, sys_fallocate



#ifdef CONFIG_SUNOS_EMUL

	/* Now the SunOS syscall table. */
@@ -198,6 +197,6 @@ sunos_sys_table: 
	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys

/*310*/	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys

	.long sunos_nosys, sunos_nosys



#endif

arch/sparc64/defconfig

+13 −11
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.22

# Tue Jul 17 01:19:52 2007

# Thu Jul 19 21:30:37 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -16,6 +16,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_AUDIT_ARCH=y

CONFIG_ARCH_NO_VIRT_TO_BUS=y

CONFIG_SPARC64_PAGE_SIZE_8KB=y

# CONFIG_SPARC64_PAGE_SIZE_64KB is not set

# CONFIG_SPARC64_PAGE_SIZE_512KB is not set
@@ -148,7 +149,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 
CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=1

CONFIG_VIRT_TO_BUS=y

CONFIG_SBUS=y

CONFIG_SBUSCHAR=y

CONFIG_SUN_AUXIO=y
@@ -317,7 +317,6 @@ CONFIG_CONNECTOR=m 
# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_FD is not set

# CONFIG_BLK_CPQ_DA is not set

# CONFIG_BLK_CPQ_CISS_DA is not set

# CONFIG_BLK_DEV_DAC960 is not set

# CONFIG_BLK_DEV_UMEM is not set
@@ -470,10 +469,6 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_SUNESP is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_ATA is not set



#

# Multi-device support (RAID and LVM)

#

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m
@@ -610,10 +605,6 @@ CONFIG_SLHC=m 
# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem

#

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set
@@ -782,6 +773,7 @@ CONFIG_I2C_ALGOBIT=y 
CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set
@@ -808,11 +800,13 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_DME1737 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set
@@ -906,6 +900,7 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_PROM_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

CONFIG_FONTS=y

# CONFIG_FONT_8x8 is not set
@@ -1195,6 +1190,11 @@ CONFIG_USB_STORAGE=m 
# DMA Devices

#



#

# Userspace I/O

#

# CONFIG_UIO is not set



#

# Misc Linux/SPARC drivers

#
@@ -1385,6 +1385,7 @@ CONFIG_SCHEDSTATS=y 
# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_LOCK_STAT is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set
@@ -1461,6 +1462,7 @@ CONFIG_CRC_CCITT=m 
CONFIG_CRC16=m

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

arch/sparc64/kernel/ds.c

+2 −4
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/kthread.h>

#include <linux/reboot.h>

#include <linux/cpu.h>



#include <asm/ldc.h>

#include <asm/vio.h>

#include <asm/power.h>

#include <asm/mdesc.h>

#include <asm/head.h>

#include <asm/irq.h>
@@ -328,7 +328,7 @@ static void domain_shutdown_data(struct ldc_channel *lp, 


	ds_send(lp, &pkt, sizeof(pkt));



	wake_up_powerd();

	orderly_poweroff(true);

}



struct ds_panic_req {
@@ -1133,8 +1133,6 @@ static int __devinit ds_probe(struct vio_dev *vdev, 


	ds_info = dp;



	start_powerd();



	return err;



out_free_ldc:

arch/sparc64/kernel/head.S

+0 −1
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ tlb_fixup_done: 
	or	%g6, %lo(init_thread_union), %g6

	ldx	[%g6 + TI_TASK], %g4

	mov	%sp, %l6

	mov	%o4, %l7



	wr	%g0, ASI_P, %asi

	mov	1, %g1

arch/sparc64/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -701,10 +701,10 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino) 
{

	unsigned long sysino, hv_err;



	BUG_ON(devhandle & ~IMAP_IGN);

	BUG_ON(devino & ~IMAP_INO);

	BUG_ON(devhandle & devino);



	sysino = devhandle | devino;

	BUG_ON(sysino & ~(IMAP_IGN | IMAP_INO));



	hv_err = sun4v_vintr_set_cookie(devhandle, devino, sysino);

	if (hv_err) {