Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/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
  • Loading branch information
@torvalds
torvalds committed Oct 19, 2012
2 parents 22054fb + e1858b2 commit fb06de0
Show file tree
Hide file tree
Showing 104 changed files with 112 additions and 136 deletions.
3 changes: 0 additions & 3 deletions arch/hexagon/include/asm/Kbuild
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/atomic.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/barrier.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/bitops.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/cache.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/cacheflush.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Cache flush 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
* it under the terms of the GNU General Public License version 2 and
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/checksum.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/cmpxchg.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* xchg/cmpxchg 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/delay.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/dma-mapping.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* DMA 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
* it under the terms of the GNU General Public License version 2 and
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/dma.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/elf.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* ELF 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/exec.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Process execution related 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/fixmap.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Fixmap support for Hexagon - enough to support highmem features
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/hexagon_vm.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Declarations for to Hexagon Virtal Machine.
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/intrinsics.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/io.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* IO 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/irq.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/irqflags.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* IRQ support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/kgdb.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/hexagon/include/asm/kgdb.h - Hexagon KGDB Support
*
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (c) 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/linkage.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/mem-layout.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Memory layout 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/mmu.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/mmu_context.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MM context support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/module.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/page.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Page management 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/perf_event.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/pgalloc.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Page table support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/pgtable.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Page table support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/processor.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Process/processor support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/smp.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SMP 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/spinlock.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Spinlock support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/spinlock_types.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Spinlock support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/string.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/suspend.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/switch_to.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Task switching 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Syscall support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/thread_info.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Thread support 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/time.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/timer-regs.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Timer support for Hexagon
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/timex.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/tlb.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/tlbflush.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* TLB flush support for Hexagon
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/traps.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Trap support for Hexagon
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/uaccess.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* User memory access support for Hexagon
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/vdso.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* vDSO implementation for Hexagon
*
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (c) 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
Expand Down
2 changes: 1 addition & 1 deletion arch/hexagon/include/asm/vm_fault.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down
Loading

0 comments on commit fb06de0

Please sign in to comment.