Commit fb06de04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel 

Pull hexagon updates from Richard Kuo:
 "It includes the Hexagon UAPI changes from David Howells and some CR
  marking changes for the transition from Code Aurora to Linux
  Foundation."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  Hexagon: Copyright marking changes
  UAPI: (Scripted) Disintegrate arch/hexagon/include/asm
parents 22054fbe e1858b2a

arch/hexagon/include/asm/Kbuild

+0 −3
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += registers.h

header-y += ucontext.h

header-y += user.h



generic-y += auxvec.h

generic-y += bug.h

arch/hexagon/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Atomic operations for the Hexagon architecture

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

arch/hexagon/include/asm/barrier.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Memory barrier definitions for the Hexagon architecture

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

arch/hexagon/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Bit operations for the Hexagon architecture

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

arch/hexagon/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Cache definitions for the Hexagon architecture

 *

 * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

CRA Git | Maintained and supported by SUSTech CRA and CCSE