Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 02:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

A mix of typos and critical fixes.

Browse Source 
The most important ones are a duplicated definition of a Kconfig
 variable and the handling of external interrupts for non-DT case.
 The new at91sam9g10 was suffering a recognition issue due to an ID
 mis-interpreted: this was leading to a kernel panic.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQiPCWAAoJEAf03oE53VmQHZcH/2cAmpXeCoLwtpmRs0WpumtN
 OnIVB0W4EchnCUSfd19q4FiUANfPFAxRN0yxx8Sby4wUMUMKnAu6eLebhumeBl6i
 L/80KDwIUOhxXCt8YV9tjH1sGDddiG8oQWLF9wfKTIAyTNKcG3usuxq/bTooiXnE
 8i1dYvM0w9A7vseYDOOzDgapslStJUBaaZllNddhyP/FyGJZopGb6ObhI1PLeyTJ
 iRLA5+NeFAdHIV7y875JlIWacfzQxEa0u2cptVAz9ZmYobesTZJkhzGAjpFEwUB1
 bGktll0opy+2pPg8JFqZLC/qdYzVZJxSBWbT/zA2amf8asN4NFReTxHnsh81Rfs=
 =AgpJ
 -----END PGP SIGNATURE-----

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

From  Nicolas Ferre <nicolas.ferre@atmel.com>:

A mix of typos and critical fixes.
The most important ones are a duplicated definition of a Kconfig
variable and the handling of external interrupts for non-DT case.
The new at91sam9g10 was suffering a recognition issue due to an ID
mis-interpreted: this was leading to a kernel panic.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91: (257 commits)
  ARM: at91: drop duplicated config SOC_AT91SAM9 entry
  ARM: at91/i2c: change id to let i2c-at91 work
  ARM: at91/i2c: change id to let i2c-gpio work
  ARM: at91/dts: at91sam9g20ek_common: Fix typos in buttons labels.
  ARM: at91: fix external interrupt specification in board code
  ARM: at91: fix external interrupts in non-DT case
  ARM: at91: at91sam9g10: fix SOC type detection
  ARM: at91/tc: fix typo in the DT document

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-10-25 15:47:19 +02:00
commit 2adca5672f
583 changed files with 8447 additions and 7693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -14,10 +14,6 @@
*.o.* *.o.*
*.a *.a
*.s *.s
*.ko.unsigned
*.ko.stripped
*.ko.stripped.dig
*.ko.stripped.sig
*.ko *.ko
*.so *.so
*.so.dbg *.so.dbg
@ -95,6 +91,4 @@ GTAGS
extra_certificates extra_certificates
signing_key.priv signing_key.priv
signing_key.x509 signing_key.x509
signing_key.x509.keyid
signing_key.x509.signer
x509.genkey x509.genkey

76
Documentation/DocBook/media/Makefile
View File

@ -56,15 +56,15 @@ FUNCS = \
write \ write \
IOCTLS = \ IOCTLS = \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \
$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \ $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
VIDIOC_SUBDEV_G_FRAME_INTERVAL \ VIDIOC_SUBDEV_G_FRAME_INTERVAL \
VIDIOC_SUBDEV_S_FRAME_INTERVAL \ VIDIOC_SUBDEV_S_FRAME_INTERVAL \
VIDIOC_SUBDEV_ENUM_MBUS_CODE \ VIDIOC_SUBDEV_ENUM_MBUS_CODE \
@ -74,32 +74,32 @@ IOCTLS = \
VIDIOC_SUBDEV_S_SELECTION \ VIDIOC_SUBDEV_S_SELECTION \
TYPES = \ TYPES = \
$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \ $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \
$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h) $(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h)
ENUMS = \ ENUMS = \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \ $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \
$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h)
STRUCTS = \ STRUCTS = \
$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \ $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \
$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \ $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \
$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \ $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \
$(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/frontend.h) \ $(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/frontend.h) \
$(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/linux/dvb/net.h) \ $(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/net.h) \
$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/video.h) \ $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/video.h) \
$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \
$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \ $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h)
ERRORS = \ ERRORS = \
E2BIG \ E2BIG \
@ -205,7 +205,7 @@ $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)
@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/) @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)
@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/) @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)
$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -216,7 +216,7 @@ $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_O
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/uapi/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -227,7 +227,7 @@ $(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_D
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/uapi/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -238,7 +238,7 @@ $(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/uapi/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -249,7 +249,7 @@ $(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/uapi/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -260,7 +260,7 @@ $(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/uapi/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@
@ -271,7 +271,7 @@ $(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/
@( \ @( \
echo "</programlisting>") >> $@ echo "</programlisting>") >> $@
$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml $(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/uapi/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml
@$($(quiet)gen_xml) @$($(quiet)gen_xml)
@( \ @( \
echo "<programlisting>") > $@ echo "<programlisting>") > $@

4
Documentation/DocBook/networking.tmpl
View File

@ -56,7 +56,7 @@
!Enet/core/filter.c !Enet/core/filter.c
</sect1> </sect1>
<sect1><title>Generic Network Statistics</title> <sect1><title>Generic Network Statistics</title>
!Iinclude/linux/gen_stats.h !Iinclude/uapi/linux/gen_stats.h
!Enet/core/gen_stats.c !Enet/core/gen_stats.c
!Enet/core/gen_estimator.c !Enet/core/gen_estimator.c
</sect1> </sect1>
@ -80,7 +80,7 @@
!Enet/wimax/op-rfkill.c !Enet/wimax/op-rfkill.c
!Enet/wimax/stack.c !Enet/wimax/stack.c
!Iinclude/net/wimax.h !Iinclude/net/wimax.h
!Iinclude/linux/wimax.h !Iinclude/uapi/linux/wimax.h
</sect1> </sect1>
</chapter> </chapter>

65
Documentation/IPMI.txt
View File

@ -42,13 +42,7 @@ The driver interface depends on your hardware. If your system
properly provides the SMBIOS info for IPMI, the driver will detect it properly provides the SMBIOS info for IPMI, the driver will detect it
and just work. If you have a board with a standard interface (These and just work. If you have a board with a standard interface (These
will generally be either "KCS", "SMIC", or "BT", consult your hardware will generally be either "KCS", "SMIC", or "BT", consult your hardware
manual), choose the 'IPMI SI handler' option. A driver also exists manual), choose the 'IPMI SI handler' option.
for direct I2C access to the IPMI management controller. Some boards
support this, but it is unknown if it will work on every board. For
this, choose 'IPMI SMBus handler', but be ready to try to do some
figuring to see if it will work on your system if the SMBIOS/APCI
information is wrong or not present. It is fairly safe to have both
these enabled and let the drivers auto-detect what is present.
You should generally enable ACPI on your system, as systems with IPMI You should generally enable ACPI on your system, as systems with IPMI
can have ACPI tables describing them. can have ACPI tables describing them.
@ -58,8 +52,7 @@ their job correctly, the IPMI controller should be automatically
detected (via ACPI or SMBIOS tables) and should just work. Sadly, detected (via ACPI or SMBIOS tables) and should just work. Sadly,
many boards do not have this information. The driver attempts many boards do not have this information. The driver attempts
standard defaults, but they may not work. If you fall into this standard defaults, but they may not work. If you fall into this
situation, you need to read the section below named 'The SI Driver' or situation, you need to read the section below named 'The SI Driver'.
"The SMBus Driver" on how to hand-configure your system.
IPMI defines a standard watchdog timer. You can enable this with the IPMI defines a standard watchdog timer. You can enable this with the
'IPMI Watchdog Timer' config option. If you compile the driver into 'IPMI Watchdog Timer' config option. If you compile the driver into
@ -104,12 +97,7 @@ driver, each open file for this device ties in to the message handler
as an IPMI user. as an IPMI user.
ipmi_si - A driver for various system interfaces. This supports KCS, ipmi_si - A driver for various system interfaces. This supports KCS,
SMIC, and BT interfaces. Unless you have an SMBus interface or your SMIC, and BT interfaces.
own custom interface, you probably need to use this.
ipmi_smb - A driver for accessing BMCs on the SMBus. It uses the
I2C kernel driver's SMBus interfaces to send and receive IPMI messages
over the SMBus.
ipmi_watchdog - IPMI requires systems to have a very capable watchdog ipmi_watchdog - IPMI requires systems to have a very capable watchdog
timer. This driver implements the standard Linux watchdog timer timer. This driver implements the standard Linux watchdog timer
@ -482,53 +470,6 @@ for specifying an interface. Note that when removing an interface,
only the first three parameters (si type, address type, and address) only the first three parameters (si type, address type, and address)
are used for the comparison. Any options are ignored for removing. are used for the comparison. Any options are ignored for removing.
The SMBus Driver
----------------
The SMBus driver allows up to 4 SMBus devices to be configured in the
system. By default, the driver will register any SMBus interfaces it finds
in the I2C address range of 0x20 to 0x4f on any adapter. You can change this
at module load time (for a module) with:
modprobe ipmi_smb.o
addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]
dbg=<flags1>,<flags2>...
[defaultprobe=1] [dbg_probe=1]
The addresses are specified in pairs, the first is the adapter ID and the
second is the I2C address on that adapter.
The debug flags are bit flags for each BMC found, they are:
IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8
Setting smb_defaultprobe to zero disabled the default probing of SMBus
interfaces at address range 0x20 to 0x4f. This means that only the
BMCs specified on the smb_addr line will be detected.
Setting smb_dbg_probe to 1 will enable debugging of the probing and
detection process for BMCs on the SMBusses.
Discovering the IPMI compliant BMC on the SMBus can cause devices
on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI
message as a block write to the I2C bus and waits for a response.
This action can be detrimental to some I2C devices. It is highly recommended
that the known I2c address be given to the SMBus driver in the smb_addr
parameter. The default address range will not be used when a smb_addr
parameter is provided.
When compiled into the kernel, the addresses can be specified on the
kernel command line as:
ipmb_smb.addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]
ipmi_smb.dbg=<flags1>,<flags2>...
ipmi_smb.defaultprobe=0 ipmi_smb.dbg_probe=1
These are the same options as on the module command line.
Note that you might need some I2C changes if CONFIG_IPMI_PANIC_EVENT
is enabled along with this, so the I2C driver knows to run to
completion during sending a panic event.
Other Pieces Other Pieces
------------ ------------

2
Documentation/devicetree/bindings/arm/atmel-at91.txt
View File

@ -8,7 +8,7 @@ PIT Timer required properties:
shared across all System Controller members. shared across all System Controller members.
TC/TCLIB Timer required properties: TC/TCLIB Timer required properties:
- compatible: Should be "atmel,<chip>-pit". - compatible: Should be "atmel,<chip>-tcb".
<chip> can be "at91rm9200" or "at91sam9x5" <chip> can be "at91rm9200" or "at91sam9x5"
- reg: Should contain registers location and length - reg: Should contain registers location and length
- interrupts: Should contain all interrupts for the TC block - interrupts: Should contain all interrupts for the TC block

1
Documentation/hwmon/coretemp
View File

@ -105,6 +105,7 @@ Process Processor TjMax(C)
330/230 125 330/230 125
E680/660/640/620 90 E680/660/640/620 90
E680T/660T/640T/620T 110 E680T/660T/640T/620T 110
CE4170/4150/4110 110
45nm Core2 Processors 45nm Core2 Processors
Solo ULV SU3500/3300 100 Solo ULV SU3500/3300 100

3
Documentation/hwmon/submitting-patches
View File

@ -60,8 +60,7 @@ increase the chances of your change being accepted.
* Add the driver to Kconfig and Makefile in alphabetical order. * Add the driver to Kconfig and Makefile in alphabetical order.
* Make sure that all dependencies are listed in Kconfig. For new drivers, it * Make sure that all dependencies are listed in Kconfig.
is most likely prudent to add a dependency on EXPERIMENTAL.
* Avoid forward declarations if you can. Rearrange the code if necessary. * Avoid forward declarations if you can. Rearrange the code if necessary.

1
Documentation/sysrq.txt
View File

@ -116,6 +116,7 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
'w' - Dumps tasks that are in uninterruptable (blocked) state. 'w' - Dumps tasks that are in uninterruptable (blocked) state.
'x' - Used by xmon interface on ppc/powerpc platforms. 'x' - Used by xmon interface on ppc/powerpc platforms.
Show global PMU Registers on sparc64.
'y' - Show global CPU Registers [SPARC-64 specific] 'y' - Show global CPU Registers [SPARC-64 specific]

24
MAINTAINERS
View File

@ -235,6 +235,7 @@ F: drivers/platform/x86/acer-wmi.c
ACPI ACPI
M: Len Brown <lenb@kernel.org> M: Len Brown <lenb@kernel.org>
M: Rafael J. Wysocki <rjw@sisk.pl>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: http://www.lesswatts.org/projects/acpi/
Q: http://patchwork.kernel.org/project/linux-acpi/list/ Q: http://patchwork.kernel.org/project/linux-acpi/list/
@ -4372,7 +4373,7 @@ F: Documentation/scsi/53c700.txt
F: drivers/scsi/53c700* F: drivers/scsi/53c700*
LED SUBSYSTEM LED SUBSYSTEM
M: Bryan Wu <bryan.wu@canonical.com> M: Bryan Wu <cooloney@gmail.com>
M: Richard Purdie <rpurdie@rpsys.net> M: Richard Purdie <rpurdie@rpsys.net>
L: linux-leds@vger.kernel.org L: linux-leds@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@ -5019,6 +5020,20 @@ F: net/ipv6/
F: include/net/ip* F: include/net/ip*
F: arch/x86/net/* F: arch/x86/net/*
NETWORKING [IPSEC]
M: Steffen Klassert <steffen.klassert@secunet.com>
M: Herbert Xu <herbert@gondor.apana.org.au>
M: "David S. Miller" <davem@davemloft.net>
L: netdev@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
S: Maintained
F: net/xfrm/
F: net/key/
F: net/ipv4/xfrm*
F: net/ipv6/xfrm*
F: include/uapi/linux/xfrm.h
F: include/net/xfrm.h
NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
M: Paul Moore <paul@paul-moore.com> M: Paul Moore <paul@paul-moore.com>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
@ -7731,6 +7746,13 @@ W: http://www.ideasonboard.org/uvc/
S: Maintained S: Maintained
F: drivers/media/usb/uvc/ F: drivers/media/usb/uvc/
USB WEBCAM GADGET
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
L: linux-usb@vger.kernel.org
S: Maintained
F: drivers/usb/gadget/*uvc*.c
F: drivers/usb/gadget/webcam.c
USB WIRELESS RNDIS DRIVER (rndis_wlan) USB WIRELESS RNDIS DRIVER (rndis_wlan)
M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org

17
Makefile
View File

@ -1,7 +1,7 @@
VERSION = 3 VERSION = 3
PATCHLEVEL = 7 PATCHLEVEL = 7
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = -rc1 EXTRAVERSION = -rc2
NAME = Terrified Chipmunk NAME = Terrified Chipmunk
# *DOCUMENTATION* # *DOCUMENTATION*
@ -437,7 +437,9 @@ endif
PHONY += asm-generic PHONY += asm-generic
asm-generic: asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
obj=arch/$(SRCARCH)/include/generated/asm src=asm obj=arch/$(SRCARCH)/include/generated/asm
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
# To make sure we do not include .config for any of the *config targets # To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile # catch them early, and hand them over to scripts/kconfig/Makefile
@ -717,6 +719,17 @@ endif # INSTALL_MOD_STRIP
export mod_strip_cmd export mod_strip_cmd
ifeq ($(CONFIG_MODULE_SIG),y)
MODSECKEY = ./signing_key.priv
MODPUBKEY = ./signing_key.x509
export MODPUBKEY
mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY)
else
mod_sign_cmd = true
endif
export mod_sign_cmd
ifeq ($(KBUILD_EXTMOD),) ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/

4
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View File

@ -126,14 +126,14 @@
#size-cells = <0>; #size-cells = <0>;
btn3 { btn3 {
label = "Buttin 3"; label = "Button 3";
gpios = <&pioA 30 1>; gpios = <&pioA 30 1>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
btn4 { btn4 {
label = "Buttin 4"; label = "Button 4";
gpios = <&pioA 31 1>; gpios = <&pioA 31 1>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; gpio-key,wakeup;

4
arch/arm/kernel/entry-common.S
View File

@ -88,9 +88,9 @@ ENTRY(ret_from_fork)
bl schedule_tail bl schedule_tail
cmp r5, #0 cmp r5, #0
movne r0, r4 movne r0, r4
movne lr, pc adrne lr, BSYM(1f)
movne pc, r5 movne pc, r5
get_thread_info tsk 1: get_thread_info tsk
b ret_slow_syscall b ret_slow_syscall
ENDPROC(ret_from_fork) ENDPROC(ret_from_fork)

10
arch/arm/mach-at91/Kconfig
View File

@ -21,19 +21,13 @@ config SOC_AT91SAM9
bool bool
select CPU_ARM926T select CPU_ARM926T
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
menu "Atmel AT91 System-on-Chip" menu "Atmel AT91 System-on-Chip"
comment "Atmel AT91 Processor" comment "Atmel AT91 Processor"
config SOC_AT91SAM9
bool
select AT91_SAM9_SMC
select AT91_SAM9_TIME
select CPU_ARM926T
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
config SOC_AT91RM9200 config SOC_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
select CPU_ARM920T select CPU_ARM920T

2
arch/arm/mach-at91/at91rm9200.c
View File

@ -187,7 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk),
/* fake hclk clock */ /* fake hclk clock */
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioA", &pioA_clk),

4
arch/arm/mach-at91/at91rm9200_devices.c
View File

@ -479,7 +479,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91rm9200_twi_device = { static struct platform_device at91rm9200_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
@ -512,7 +512,7 @@ static struct resource twi_resources[] = {
static struct platform_device at91rm9200_twi_device = { static struct platform_device at91rm9200_twi_device = {
.name = "i2c-at91rm9200", .name = "i2c-at91rm9200",
.id = -1, .id = 0,
.resource = twi_resources, .resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources), .num_resources = ARRAY_SIZE(twi_resources),
}; };

4
arch/arm/mach-at91/at91sam9260.c
View File

@ -211,8 +211,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk),
/* more usart lookup table for DT entries */ /* more usart lookup table for DT entries */
CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk),

4
arch/arm/mach-at91/at91sam9260_devices.c
View File

@ -389,7 +389,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9260_twi_device = { static struct platform_device at91sam9260_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
@ -421,7 +421,7 @@ static struct resource twi_resources[] = {
}; };
static struct platform_device at91sam9260_twi_device = { static struct platform_device at91sam9260_twi_device = {
.id = -1, .id = 0,
.resource = twi_resources, .resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources), .num_resources = ARRAY_SIZE(twi_resources),
}; };

4
arch/arm/mach-at91/at91sam9261.c
View File

@ -178,8 +178,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk),
CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioA", &pioA_clk),
CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioB", &pioB_clk),
CLKDEV_CON_ID("pioC", &pioC_clk), CLKDEV_CON_ID("pioC", &pioC_clk),

4
arch/arm/mach-at91/at91sam9261_devices.c
View File

@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9261_twi_device = { static struct platform_device at91sam9261_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
@ -317,7 +317,7 @@ static struct resource twi_resources[] = {
}; };
static struct platform_device at91sam9261_twi_device = { static struct platform_device at91sam9261_twi_device = {
.id = -1, .id = 0,
.resource = twi_resources, .resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources), .num_resources = ARRAY_SIZE(twi_resources),
}; };

2
arch/arm/mach-at91/at91sam9263.c
View File

@ -193,7 +193,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk),
/* fake hclk clock */ /* fake hclk clock */
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioA", &pioA_clk),

4
arch/arm/mach-at91/at91sam9263_devices.c
View File

@ -567,7 +567,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9263_twi_device = { static struct platform_device at91sam9263_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
@ -600,7 +600,7 @@ static struct resource twi_resources[] = {
static struct platform_device at91sam9263_twi_device = { static struct platform_device at91sam9263_twi_device = {
.name = "i2c-at91sam9260", .name = "i2c-at91sam9260",
.id = -1, .id = 0,
.resource = twi_resources, .resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources), .num_resources = ARRAY_SIZE(twi_resources),
}; };

4
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = {
static struct platform_device at91sam9rl_twi_device = { static struct platform_device at91sam9rl_twi_device = {
.name = "i2c-gpio", .name = "i2c-gpio",
.id = -1, .id = 0,
.dev.platform_data = &pdata, .dev.platform_data = &pdata,
}; };
@ -347,7 +347,7 @@ static struct resource twi_resources[] = {
static struct platform_device at91sam9rl_twi_device = { static struct platform_device at91sam9rl_twi_device = {
.name = "i2c-at91sam9g20", .name = "i2c-at91sam9g20",
.id = -1, .id = 0,
.resource = twi_resources, .resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources), .num_resources = ARRAY_SIZE(twi_resources),
}; };

2
arch/arm/mach-at91/board-neocore926.c
View File

@ -129,7 +129,7 @@ static struct spi_board_info neocore926_spi_devices[] = {
.max_speed_hz = 125000 * 16, .max_speed_hz = 125000 * 16,
.bus_num = 0, .bus_num = 0,
.platform_data = &ads_info, .platform_data = &ads_info,
.irq = AT91SAM9263_ID_IRQ1, .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
}, },
#endif #endif
}; };

2
arch/arm/mach-at91/board-sam9261ek.c
View File

@ -309,7 +309,7 @@ static struct spi_board_info ek_spi_devices[] = {
.max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */
.bus_num = 0, .bus_num = 0,
.platform_data = &ads_info, .platform_data = &ads_info,
.irq = AT91SAM9261_ID_IRQ0, .irq = NR_IRQS_LEGACY + AT91SAM9261_ID_IRQ0,
.controller_data = (void *) AT91_PIN_PA28, /* CS pin */ .controller_data = (void *) AT91_PIN_PA28, /* CS pin */
}, },
#endif #endif

2
arch/arm/mach-at91/board-sam9263ek.c
View File

@ -132,7 +132,7 @@ static struct spi_board_info ek_spi_devices[] = {
.max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */
.bus_num = 0, .bus_num = 0,
.platform_data = &ads_info, .platform_data = &ads_info,
.irq = AT91SAM9263_ID_IRQ1, .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
}, },
#endif #endif
}; };

3
arch/arm/mach-at91/generic.h
View File

@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(void);
extern void __init at91_init_irq_default(void); extern void __init at91_init_irq_default(void);
extern void __init at91_init_interrupts(unsigned int priority[]); extern void __init at91_init_interrupts(unsigned int priority[]);
extern void __init at91x40_init_interrupts(unsigned int priority[]); extern void __init at91x40_init_interrupts(unsigned int priority[]);
extern void __init at91_aic_init(unsigned int priority[]); extern void __init at91_aic_init(unsigned int priority[],
unsigned int ext_irq_mask);
extern int __init at91_aic_of_init(struct device_node *node, extern int __init at91_aic_of_init(struct device_node *node,
struct device_node *parent); struct device_node *parent);
extern int __init at91_aic5_of_init(struct device_node *node, extern int __init at91_aic5_of_init(struct device_node *node,

9
arch/arm/mach-at91/irq.c
View File

@ -502,14 +502,19 @@ int __init at91_aic5_of_init(struct device_node *node,
/* /*
* Initialize the AIC interrupt controller. * Initialize the AIC interrupt controller.
*/ */
void __init at91_aic_init(unsigned int *priority) void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask)
{ {
unsigned int i; unsigned int i;
int irq_base; int irq_base;
if (at91_aic_pm_init()) at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs)
* sizeof(*at91_extern_irq), GFP_KERNEL);
if (at91_aic_pm_init() || at91_extern_irq == NULL)
panic("Unable to allocate bit maps\n"); panic("Unable to allocate bit maps\n");
*at91_extern_irq = ext_irq_mask;
at91_aic_base = ioremap(AT91_AIC, 512); at91_aic_base = ioremap(AT91_AIC, 512);
if (!at91_aic_base) if (!at91_aic_base)
panic("Unable to ioremap AIC registers\n"); panic("Unable to ioremap AIC registers\n");

4
arch/arm/mach-at91/setup.c
View File

@ -47,7 +47,7 @@ void __init at91_init_irq_default(void)
void __init at91_init_interrupts(unsigned int *priority) void __init at91_init_interrupts(unsigned int *priority)
{ {
/* Initialize the AIC interrupt controller */ /* Initialize the AIC interrupt controller */
at91_aic_init(priority); at91_aic_init(priority, at91_extern_irq);
/* Enable GPIO interrupts */ /* Enable GPIO interrupts */
at91_gpio_irq_setup(); at91_gpio_irq_setup();
@ -151,7 +151,7 @@ static void __init soc_detect(u32 dbgu_base)
} }
/* at91sam9g10 */ /* at91sam9g10 */
if ((cidr & ~AT91_CIDR_EXT) == ARCH_ID_AT91SAM9G10) { if ((socid & ~AT91_CIDR_EXT) == ARCH_ID_AT91SAM9G10) {
at91_soc_initdata.type = AT91_SOC_SAM9G10; at91_soc_initdata.type = AT91_SOC_SAM9G10;
at91_boot_soc = at91sam9261_soc; at91_boot_soc = at91sam9261_soc;
} }

12
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -444,16 +444,28 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
.lclk_khz_max = 1334, /* results in 5fps CIF, 10fps QCIF */ .lclk_khz_max = 1334, /* results in 5fps CIF, 10fps QCIF */
}; };
static struct platform_device ams_delta_audio_device = {
.name = "ams-delta-audio",
.id = -1,
};
static struct platform_device cx20442_codec_device = {
.name = "cx20442-codec",
.id = -1,
};
static struct platform_device *ams_delta_devices[] __initdata = { static struct platform_device *ams_delta_devices[] __initdata = {
&latch1_gpio_device, &latch1_gpio_device,
&latch2_gpio_device, &latch2_gpio_device,
&ams_delta_kp_device, &ams_delta_kp_device,
&ams_delta_camera_device, &ams_delta_camera_device,
&ams_delta_audio_device,
}; };
static struct platform_device *late_devices[] __initdata = { static struct platform_device *late_devices[] __initdata = {
&ams_delta_nand_device, &ams_delta_nand_device,
&ams_delta_lcd_device, &ams_delta_lcd_device,
&cx20442_codec_device,
}; };
static void __init ams_delta_init(void) static void __init ams_delta_init(void)

13
arch/arm/mach-prima2/include/mach/gpio.h
View File

@ -1,13 +0,0 @@
#ifndef __MACH_GPIO_H
#define __MACH_GPIO_H
/* Pull up/down values */
enum sirfsoc_gpio_pull {
SIRFSOC_GPIO_PULL_NONE,
SIRFSOC_GPIO_PULL_UP,
SIRFSOC_GPIO_PULL_DOWN,
};
void sirfsoc_gpio_set_pull(unsigned gpio, unsigned mode);
#endif

1
arch/arm64/Kconfig
View File

@ -22,6 +22,7 @@ config ARM64
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_SPARSE_IRQ select HAVE_SPARSE_IRQ
select IRQ_DOMAIN select IRQ_DOMAIN
select MODULES_USE_ELF_RELA
select NO_BOOTMEM select NO_BOOTMEM
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE

1
arch/arm64/include/asm/Kbuild
View File

@ -18,7 +18,6 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += kdebug.h generic-y += kdebug.h
generic-y += kmap_types.h generic-y += kmap_types.h
generic-y += linkage.h
generic-y += local.h generic-y += local.h
generic-y += local64.h generic-y += local64.h
generic-y += mman.h generic-y += mman.h

7
arch/arm64/include/asm/linkage.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H
#define __ALIGN .align 4
#define __ALIGN_STR ".align 4"
#endif

10
arch/arm64/include/asm/processor.h
View File

@ -92,30 +92,20 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc)
static inline void start_thread(struct pt_regs *regs, unsigned long pc, static inline void start_thread(struct pt_regs *regs, unsigned long pc,
unsigned long sp) unsigned long sp)
{ {
unsigned long *stack = (unsigned long *)sp;
start_thread_common(regs, pc); start_thread_common(regs, pc);
regs->pstate = PSR_MODE_EL0t; regs->pstate = PSR_MODE_EL0t;
regs->sp = sp; regs->sp = sp;
regs->regs[2] = stack[2]; /* x2 (envp) */
regs->regs[1] = stack[1]; /* x1 (argv) */
regs->regs[0] = stack[0]; /* x0 (argc) */
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,
unsigned long sp) unsigned long sp)
{ {
unsigned int *stack = (unsigned int *)sp;
start_thread_common(regs, pc); start_thread_common(regs, pc);
regs->pstate = COMPAT_PSR_MODE_USR; regs->pstate = COMPAT_PSR_MODE_USR;
if (pc & 1) if (pc & 1)
regs->pstate |= COMPAT_PSR_T_BIT; regs->pstate |= COMPAT_PSR_T_BIT;
regs->compat_sp = sp; regs->compat_sp = sp;
regs->regs[2] = stack[2]; /* x2 (envp) */
regs->regs[1] = stack[1]; /* x1 (argv) */
regs->regs[0] = stack[0]; /* x0 (argc) */
} }
#endif #endif

3
arch/arm64/include/uapi/asm/ptrace.h
View File

@ -79,13 +79,14 @@ struct user_fpsimd_state {
struct user_hwdebug_state { struct user_hwdebug_state {
__u32 dbg_info; __u32 dbg_info;
__u32 pad;
struct { struct {
__u64 addr; __u64 addr;
__u32 ctrl; __u32 ctrl;
__u32 pad;
} dbg_regs[16]; } dbg_regs[16];
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _UAPI__ASM_PTRACE_H */ #endif /* _UAPI__ASM_PTRACE_H */

71
arch/arm64/kernel/ptrace.c
View File

@ -234,28 +234,33 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type,
struct arch_hw_breakpoint_ctrl ctrl, struct arch_hw_breakpoint_ctrl ctrl,
struct perf_event_attr *attr) struct perf_event_attr *attr)
{ {
int err, len, type; int err, len, type, disabled = !ctrl.enabled;
err = arch_bp_generic_fields(ctrl, &len, &type); if (disabled) {
if (err) len = 0;
return err; type = HW_BREAKPOINT_EMPTY;
} else {
err = arch_bp_generic_fields(ctrl, &len, &type);
if (err)
return err;
switch (note_type) { switch (note_type) {
case NT_ARM_HW_BREAK: case NT_ARM_HW_BREAK:
if ((type & HW_BREAKPOINT_X) != type) if ((type & HW_BREAKPOINT_X) != type)
return -EINVAL;
break;
case NT_ARM_HW_WATCH:
if ((type & HW_BREAKPOINT_RW) != type)
return -EINVAL;
break;
default:
return -EINVAL; return -EINVAL;
break; }
case NT_ARM_HW_WATCH:
if ((type & HW_BREAKPOINT_RW) != type)
return -EINVAL;
break;
default:
return -EINVAL;
} }
attr->bp_len = len; attr->bp_len = len;
attr->bp_type = type; attr->bp_type = type;
attr->disabled = !ctrl.enabled; attr->disabled = disabled;
return 0; return 0;
} }
@ -372,7 +377,7 @@ static int ptrace_hbp_set_addr(unsigned int note_type,
#define PTRACE_HBP_ADDR_SZ sizeof(u64) #define PTRACE_HBP_ADDR_SZ sizeof(u64)
#define PTRACE_HBP_CTRL_SZ sizeof(u32) #define PTRACE_HBP_CTRL_SZ sizeof(u32)
#define PTRACE_HBP_REG_OFF sizeof(u32) #define PTRACE_HBP_PAD_SZ sizeof(u32)
static int hw_break_get(struct task_struct *target, static int hw_break_get(struct task_struct *target,
const struct user_regset *regset, const struct user_regset *regset,
@ -380,7 +385,7 @@ static int hw_break_get(struct task_struct *target,
void *kbuf, void __user *ubuf) void *kbuf, void __user *ubuf)
{ {
unsigned int note_type = regset->core_note_type; unsigned int note_type = regset->core_note_type;
int ret, idx = 0, offset = PTRACE_HBP_REG_OFF, limit; int ret, idx = 0, offset, limit;
u32 info, ctrl; u32 info, ctrl;
u64 addr; u64 addr;
@ -389,11 +394,20 @@ static int hw_break_get(struct task_struct *target,
if (ret) if (ret)
return ret; return ret;
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &info, 0, 4); ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &info, 0,
sizeof(info));
if (ret)
return ret;
/* Pad */
offset = offsetof(struct user_hwdebug_state, pad);
ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf, offset,
offset + PTRACE_HBP_PAD_SZ);
if (ret) if (ret)
return ret; return ret;
/* (address, ctrl) registers */ /* (address, ctrl) registers */
offset = offsetof(struct user_hwdebug_state, dbg_regs);
limit = regset->n * regset->size; limit = regset->n * regset->size;
while (count && offset < limit) { while (count && offset < limit) {
ret = ptrace_hbp_get_addr(note_type, target, idx, &addr); ret = ptrace_hbp_get_addr(note_type, target, idx, &addr);
@ -413,6 +427,13 @@ static int hw_break_get(struct task_struct *target,
if (ret) if (ret)
return ret; return ret;
offset += PTRACE_HBP_CTRL_SZ; offset += PTRACE_HBP_CTRL_SZ;
ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
offset,
offset + PTRACE_HBP_PAD_SZ);
if (ret)
return ret;
offset += PTRACE_HBP_PAD_SZ;
idx++; idx++;
} }
@ -425,12 +446,13 @@ static int hw_break_set(struct task_struct *target,
const void *kbuf, const void __user *ubuf) const void *kbuf, const void __user *ubuf)
{ {
unsigned int note_type = regset->core_note_type; unsigned int note_type = regset->core_note_type;
int ret, idx = 0, offset = PTRACE_HBP_REG_OFF, limit; int ret, idx = 0, offset, limit;
u32 ctrl; u32 ctrl;
u64 addr; u64 addr;
/* Resource info */ /* Resource info and pad */
ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, 0, 4); offset = offsetof(struct user_hwdebug_state, dbg_regs);
ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, 0, offset);
if (ret) if (ret)
return ret; return ret;
@ -454,6 +476,13 @@ static int hw_break_set(struct task_struct *target,
if (ret) if (ret)
return ret; return ret;
offset += PTRACE_HBP_CTRL_SZ; offset += PTRACE_HBP_CTRL_SZ;
ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
offset,
offset + PTRACE_HBP_PAD_SZ);
if (ret)
return ret;
offset += PTRACE_HBP_PAD_SZ;
idx++; idx++;
} }

12
arch/arm64/kernel/setup.c
View File

@ -170,7 +170,19 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
void __init early_init_dt_add_memory_arch(u64 base, u64 size) void __init early_init_dt_add_memory_arch(u64 base, u64 size)
{ {
base &= PAGE_MASK;
size &= PAGE_MASK; size &= PAGE_MASK;
if (base + size < PHYS_OFFSET) {
pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
base, base + size);
return;
}
if (base < PHYS_OFFSET) {
pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
base, PHYS_OFFSET);
size -= PHYS_OFFSET - base;
base = PHYS_OFFSET;
}
memblock_add(base, size); memblock_add(base, size);
} }

1
arch/arm64/kernel/smp.c
View File

@ -46,7 +46,6 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/mmu_context.h>
/* /*
* as from 2.5, kernels no longer have an init_tasks structure * as from 2.5, kernels no longer have an init_tasks structure

20
arch/arm64/kernel/vdso.c
View File

@ -28,6 +28,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/timekeeper_internal.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
@ -222,11 +223,10 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
/* /*
* Update the vDSO data page to keep in sync with kernel timekeeping. * Update the vDSO data page to keep in sync with kernel timekeeping.
*/ */
void update_vsyscall(struct timespec *ts, struct timespec *wtm, void update_vsyscall(struct timekeeper *tk)
struct clocksource *clock, u32 mult)
{ {
struct timespec xtime_coarse; struct timespec xtime_coarse;
u32 use_syscall = strcmp(clock->name, "arch_sys_counter"); u32 use_syscall = strcmp(tk->clock->name, "arch_sys_counter");
++vdso_data->tb_seq_count; ++vdso_data->tb_seq_count;
smp_wmb(); smp_wmb();
@ -237,13 +237,13 @@ void update_vsyscall(struct timespec *ts, struct timespec *wtm,
vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec; vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec;
if (!use_syscall) { if (!use_syscall) {
vdso_data->cs_cycle_last = clock->cycle_last; vdso_data->cs_cycle_last = tk->clock->cycle_last;
vdso_data->xtime_clock_sec = ts->tv_sec; vdso_data->xtime_clock_sec = tk->xtime_sec;
vdso_data->xtime_clock_nsec = ts->tv_nsec; vdso_data->xtime_clock_nsec = tk->xtime_nsec >> tk->shift;
vdso_data->cs_mult = mult; vdso_data->cs_mult = tk->mult;
vdso_data->cs_shift = clock->shift; vdso_data->cs_shift = tk->shift;
vdso_data->wtm_clock_sec = wtm->tv_sec; vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec;
vdso_data->wtm_clock_nsec = wtm->tv_nsec; vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec;
} }
smp_wmb(); smp_wmb();

4
arch/frv/kernel/entry.S
View File

@ -867,8 +867,8 @@ ret_from_fork:
ret_from_kernel_thread: ret_from_kernel_thread:
lddi.p @(gr28,#REG_GR(8)),gr20 lddi.p @(gr28,#REG_GR(8)),gr20
call schedule_tail call schedule_tail
or.p gr20,gr20,gr8 calll.p @(gr21,gr0)
calll @(gr21,gr0) or gr20,gr20,gr8
bra sys_exit bra sys_exit
.globl ret_from_kernel_execve .globl ret_from_kernel_execve

2
arch/frv/kernel/process.c
View File

@ -194,7 +194,7 @@ int copy_thread(unsigned long clone_flags,
memset(childregs, 0, sizeof(struct pt_regs)); memset(childregs, 0, sizeof(struct pt_regs));
childregs->gr9 = usp; /* function */ childregs->gr9 = usp; /* function */
childregs->gr8 = arg; childregs->gr8 = arg;
chilregs->psr = PSR_S; childregs->psr = PSR_S;
p->thread.pc = (unsigned long) ret_from_kernel_thread; p->thread.pc = (unsigned long) ret_from_kernel_thread;
save_user_regs(p->thread.user); save_user_regs(p->thread.user);
return 0; return 0;

2
arch/frv/kernel/setup.c
View File

@ -112,9 +112,11 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE];
#ifdef CONFIG_PM #ifdef CONFIG_PM
#define __pminit #define __pminit
#define __pminitdata #define __pminitdata
#define __pminitconst
#else #else
#define __pminit __init #define __pminit __init
#define __pminitdata __initdata #define __pminitdata __initdata
#define __pminitconst __initconst
#endif #endif
struct clock_cmode { struct clock_cmode {

3
arch/hexagon/include/asm/Kbuild
View File

@ -1,8 +1,5 @@
include include/asm-generic/Kbuild.asm
header-y += registers.h
header-y += ucontext.h header-y += ucontext.h
header-y += user.h
generic-y += auxvec.h generic-y += auxvec.h
generic-y += bug.h generic-y += bug.h

2
arch/hexagon/include/asm/atomic.h
View File

@ -1,7 +1,7 @@
/* /*
* Atomic operations for the Hexagon architecture * 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 * This program is free software; you can redistribute it and/or modify

2
arch/hexagon/include/asm/barrier.h
View File

@ -1,7 +1,7 @@
/* /*
* Memory barrier definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/bitops.h
View File

@ -1,7 +1,7 @@
/* /*
* Bit operations for the Hexagon architecture * 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 * This program is free software; you can redistribute it and/or modify

2
arch/hexagon/include/asm/cache.h
View File

@ -1,7 +1,7 @@
/* /*
* Cache definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/cacheflush.h
View File

@ -1,7 +1,7 @@
/* /*
* Cache flush operations for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/checksum.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/cmpxchg.h
View File

@ -1,7 +1,7 @@
/* /*
* xchg/cmpxchg operations for the Hexagon architecture * 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 * This program is free software; you can redistribute it and/or modify

2
arch/hexagon/include/asm/delay.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/dma-mapping.h
View File

@ -1,7 +1,7 @@
/* /*
* DMA operations for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/dma.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/elf.h
View File

@ -1,7 +1,7 @@
/* /*
* ELF definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/exec.h
View File

@ -1,7 +1,7 @@
/* /*
* Process execution related definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/fixmap.h
View File

@ -1,7 +1,7 @@
/* /*
* Fixmap support for Hexagon - enough to support highmem features * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/hexagon_vm.h
View File

@ -1,7 +1,7 @@
/* /*
* Declarations for to Hexagon Virtal Machine. * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/intrinsics.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/io.h
View File

@ -1,7 +1,7 @@
/* /*
* IO definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/irq.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/irqflags.h
View File

@ -1,7 +1,7 @@
/* /*
* IRQ support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/kgdb.h
View File

@ -1,7 +1,7 @@
/* /*
* arch/hexagon/include/asm/kgdb.h - Hexagon KGDB Support * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/linkage.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/mem-layout.h
View File

@ -1,7 +1,7 @@
/* /*
* Memory layout definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/mmu.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/mmu_context.h
View File

@ -1,7 +1,7 @@
/* /*
* MM context support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/module.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/page.h
View File

@ -1,7 +1,7 @@
/* /*
* Page management definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/perf_event.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/pgalloc.h
View File

@ -1,7 +1,7 @@
/* /*
* Page table support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/pgtable.h
View File

@ -1,7 +1,7 @@
/* /*
* Page table support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/processor.h
View File

@ -1,7 +1,7 @@
/* /*
* Process/processor support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/smp.h
View File

@ -1,7 +1,7 @@
/* /*
* SMP definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/spinlock.h
View File

@ -1,7 +1,7 @@
/* /*
* Spinlock support for the Hexagon architecture * 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 * This program is free software; you can redistribute it and/or modify

2
arch/hexagon/include/asm/spinlock_types.h
View File

@ -1,7 +1,7 @@
/* /*
* Spinlock support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/string.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/suspend.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/switch_to.h
View File

@ -1,7 +1,7 @@
/* /*
* Task switching definitions for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/syscall.h
View File

@ -1,7 +1,7 @@
/* /*
* Syscall support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/thread_info.h
View File

@ -1,7 +1,7 @@
/* /*
* Thread support for the Hexagon architecture * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/time.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/timer-regs.h
View File

@ -1,7 +1,7 @@
/* /*
* Timer support for Hexagon * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/timex.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/tlb.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/tlbflush.h
View File

@ -1,7 +1,7 @@
/* /*
* TLB flush support for Hexagon * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/traps.h
View File

@ -1,7 +1,7 @@
/* /*
* Trap support for Hexagon * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/uaccess.h
View File

@ -1,7 +1,7 @@
/* /*
* User memory access support for Hexagon * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/vdso.h
View File

@ -1,7 +1,7 @@
/* /*
* vDSO implementation for Hexagon * 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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/vm_fault.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/vm_mmu.h
View File

@ -1,7 +1,7 @@
/* /*
* Hexagon VM page table entry definitions * Hexagon VM page table entry definitions
* *
* 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 * 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 * it under the terms of the GNU General Public License version 2 and

12
arch/hexagon/include/uapi/asm/Kbuild
View File

@ -1,3 +1,15 @@
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
header-y += bitsperlong.h
header-y += byteorder.h
header-y += kvm_para.h
header-y += param.h
header-y += ptrace.h
header-y += registers.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
header-y += swab.h
header-y += unistd.h
header-y += user.h

2
arch/hexagon/include/asm/bitsperlong.h → arch/hexagon/include/uapi/asm/bitsperlong.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/byteorder.h → arch/hexagon/include/uapi/asm/byteorder.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

0
arch/hexagon/include/asm/kvm_para.h → arch/hexagon/include/uapi/asm/kvm_para.h
View File

2
arch/hexagon/include/asm/param.h → arch/hexagon/include/uapi/asm/param.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/ptrace.h → arch/hexagon/include/uapi/asm/ptrace.h
View File

@ -1,7 +1,7 @@
/* /*
* Ptrace definitions for the Hexagon architecture * Ptrace 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 * 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 * it under the terms of the GNU General Public License version 2 and

17
arch/hexagon/include/asm/registers.h → arch/hexagon/include/uapi/asm/registers.h
View File

@ -1,23 +1,8 @@
/* /*
* Register definitions for the Hexagon architecture * Register definitions for the Hexagon architecture
*
* Copyright (c) 2010-2011, Code Aurora Forum. 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
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/ */
#ifndef _ASM_REGISTERS_H #ifndef _ASM_REGISTERS_H
#define _ASM_REGISTERS_H #define _ASM_REGISTERS_H

2
arch/hexagon/include/asm/setup.h → arch/hexagon/include/uapi/asm/setup.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/sigcontext.h → arch/hexagon/include/uapi/asm/sigcontext.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

2
arch/hexagon/include/asm/signal.h → arch/hexagon/include/uapi/asm/signal.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and

Some files were not shown because too many files have changed in this diff Show More