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

Commit 0798b1db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (26 commits)
  arch/tile: prefer "tilepro" as the name of the 32-bit architecture
  compat: include aio_abi.h for aio_context_t
  arch/tile: cleanups for tilegx compat mode
  arch/tile: allocate PCI IRQs later in boot
  arch/tile: support signal "exception-trace" hook
  arch/tile: use better definitions of xchg() and cmpxchg()
  include/linux/compat.h: coding-style fixes
  tile: add an RTC driver for the Tilera hypervisor
  arch/tile: finish enabling support for TILE-Gx 64-bit chip
  compat: fixes to allow working with tile arch
  arch/tile: update defconfig file to something more useful
  tile: do_hardwall_trap: do not play with task->sighand
  tile: replace mm->cpu_vm_mask with mm_cpumask()
  tile,mn10300: add device parameter to dma_cache_sync()
  audit: support the "standard" <asm-generic/unistd.h>
  arch/tile: clarify flush_buffer()/finv_buffer() function names
  arch/tile: kernel-related cleanups from removing static page size
  arch/tile: various header improvements for building drivers
  arch/tile: disable GX prefetcher during cache flush
  arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
  ...
parents ad363e09 6738d321

Makefile

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,14 @@ ifeq ($(ARCH),sh64) 
       SRCARCH := sh

endif



# Additional ARCH settings for tile

ifeq ($(ARCH),tilepro)

       SRCARCH := tile

endif

ifeq ($(ARCH),tilegx)

       SRCARCH := tile

endif



# Where to locate arch specific headers

hdr-arch  := $(SRCARCH)

arch/tile/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -339,6 +339,14 @@ config NO_IOPORT 


source "drivers/pci/Kconfig"



config HOTPLUG

	bool "Support for hot-pluggable devices"

	---help---

	  Say Y here if you want to plug devices into your computer while

	  the system is running, and be able to use them quickly.  In many

	  cases, the devices can likewise be unplugged at any time too.

	  One well-known example of this is USB.



source "drivers/pci/hotplug/Kconfig"



endmenu

arch/tile/configs/tile_defconfig

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="usr/contents.txt"

CONFIG_EXPERT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HZ_100=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

CONFIG_IPV6=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_NETDEVICES=y

CONFIG_TUN=y

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

# CONFIG_HID_SUPPORT is not set

CONFIG_RTC_CLASS=y

# CONFIG_RTC_INTF_SYSFS is not set

# CONFIG_RTC_INTF_PROC is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=m

CONFIG_TMPFS=y

CONFIG_HUGETLBFS=y

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_VM=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_DEBUG_EXTRA_FLAGS="-femit-struct-debug-baseonly"

arch/tile/configs/tilegx_defconfig

0 → 100644
+1833 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/tile/configs/tilepro_defconfig

0 → 100644
+1163 −0

File added.

Preview size limit exceeded, changes collapsed.